add bullseye support

This commit is contained in:
Kay0u 2021-06-17 15:43:50 +02:00
parent 39218300dc
commit ddaa29916b
No known key found for this signature in database
GPG key ID: AAFEEB16CFA2AE2D
4 changed files with 21 additions and 4 deletions

View file

@ -12,4 +12,15 @@ do
update_image $debian_version $ynh_version $snapshot update_image $debian_version $ynh_version $snapshot
done done
done done
done done
for debian_version in "bullseye"
do
for ynh_version in "unstable"
do
for snapshot in "before-install" "after-install"
do
update_image $debian_version $ynh_version $snapshot
done
done
done

View file

@ -33,4 +33,9 @@ do
update_image $debian_version $ynh_version $snapshot update_image $debian_version $ynh_version $snapshot
done done
done done
done done
for debian_version in "bullseye"
do
rebuild_base_containers $debian_version "unstable" "amd64"
done

1
run.sh
View file

@ -5,6 +5,7 @@ source $current_dir/variables.sh # Get variables from variables.
case ${2} in case ${2} in
prepare_script) prepare_script)
echo "CI OPEN: $CUSTOM_ENV_CI_OPEN_MERGE_REQUESTS / CI PIPELINE SOURCE: $CUSTOM_ENV_CI_PIPELINE_SOURCE / REF NAME: $CUSTOM_ENV_CI_COMMIT_REF_NAME / COMMIT: $CUSTOM_ENV_CI_COMMIT_BRANCH, TAG: $CUSTOM_ENV_CI_COMMIT_TAG"
;; ;;
get_sources) get_sources)
;; ;;

View file

@ -148,7 +148,7 @@ get_dependencies()
SSOWAT_DEPENDENCIES=$(curl https://raw.githubusercontent.com/YunoHost/ssowat/dev/debian/control 2> /dev/null | grep '^Depends:' | sed 's/Depends://' | sed -e "s/,//g" -e "s/[(][^)]*[)]//g" -e "s/ | \S\+//g" | tr "\n" " ") SSOWAT_DEPENDENCIES=$(curl https://raw.githubusercontent.com/YunoHost/ssowat/dev/debian/control 2> /dev/null | grep '^Depends:' | sed 's/Depends://' | sed -e "s/,//g" -e "s/[(][^)]*[)]//g" -e "s/ | \S\+//g" | tr "\n" " ")
BUILD_DEPENDENCIES="git-buildpackage postfix python-setuptools python3-pip devscripts" BUILD_DEPENDENCIES="git-buildpackage postfix python-setuptools python3-pip devscripts"
PIP_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html" PIP_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html"
PIP3_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black" PIP3_PKG="mock pip pytest pytest-cov pytest-mock pytest-sugar requests-mock tox ansi2html black jinja2"
} }
rebuild_base_containers() rebuild_base_containers()
@ -172,7 +172,7 @@ rebuild_base_containers()
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl -s https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash" lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl -s https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash"
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "apt-get install --assume-yes gitlab-runner" lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "apt-get install --assume-yes gitlab-runner"
INSTALL_SCRIPT="https://install.yunohost.org/$debian_version" INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/$debian_version/install_yunohost"
# Download the YunoHost install script # Download the YunoHost install script
lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl $INSTALL_SCRIPT > install.sh" lxc exec "$base_image_to_rebuild-tmp" -- /bin/bash -c "curl $INSTALL_SCRIPT > install.sh"