Paride Legovini has proposed merging ~paride/autopkgtest-cloud:deploy-from-salsa into autopkgtest-cloud:master.
Requested reviews: Canonical's Ubuntu QA (canonical-ubuntu-qa) For more details, see: https://code.launchpad.net/~paride/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/464538 -- Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~paride/autopkgtest-cloud:deploy-from-salsa into autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata index 291715b..45b3dc8 100644 --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata @@ -162,6 +162,6 @@ runcmd: - adduser ubuntu lxd - apt-get install -y --no-install-recommends git - - su - -c '[ -e autopkgtest ] || git clone -b ubuntu/cb2df3e+deb822+prod https://salsa.debian.org/ubuntu-ci-team/autopkgtest autopkgtest' ubuntu + - su - -c '[ -e autopkgtest ] || git clone -b ubuntu/production https://salsa.debian.org/ubuntu-ci-team/autopkgtest.git autopkgtest' ubuntu - su - -c 'cat /var/tmp/setup/ubuntu-crontab | crontab -' ubuntu - sh -xe /var/tmp/setup/post-boot-setup.sh & diff --git a/charms/focal/autopkgtest-cloud-worker/reactive/autopkgtest_cloud_worker.py b/charms/focal/autopkgtest-cloud-worker/reactive/autopkgtest_cloud_worker.py index 38b6c7a..50805cc 100644 --- a/charms/focal/autopkgtest-cloud-worker/reactive/autopkgtest_cloud_worker.py +++ b/charms/focal/autopkgtest-cloud-worker/reactive/autopkgtest_cloud_worker.py @@ -38,8 +38,11 @@ AUTOPKGTEST_PER_PACKAGE_LOCATION = os.path.expanduser( ) AUTOPKGTEST_CLONE_LOCATION = ( - "https://git.launchpad.net/~ubuntu-release/autopkgtest/+git/development"; + "https://salsa.debian.org/ubuntu-ci-team/autopkgtest.git"; ) + +AUTOPKGTEST_CLONE_BRANCH = "ubuntu/production" + AUTODEP8_CLONE_LOCATION = ( "https://git.launchpad.net/~ubuntu-release/+git/autodep8"; ) @@ -134,7 +137,9 @@ def clone_autopkgtest(): with UnixUser("ubuntu"): try: pygit2.clone_repository( - AUTOPKGTEST_CLONE_LOCATION, AUTOPKGTEST_LOCATION + AUTOPKGTEST_CLONE_LOCATION, + AUTOPKGTEST_LOCATION, + checkout_branch=AUTOPKGTEST_CLONE_BRANCH, ) status.maintenance("autopkgtest cloned") log("autopkgtest cloned", "INFO")
-- Mailing list: https://launchpad.net/~canonical-ubuntu-qa Post to : canonical-ubuntu-qa@lists.launchpad.net Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa More help : https://help.launchpad.net/ListHelp
