Tim Andersson has proposed merging
~andersson123/autopkgtest-cloud:align-diff-from-prod into
autopkgtest-cloud:master.
Requested reviews:
Canonical's Ubuntu QA (canonical-ubuntu-qa)
For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/462401
--
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~andersson123/autopkgtest-cloud:align-diff-from-prod into
autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances
index 0936bc0..dc4c390 100755
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/create-test-instances
@@ -28,7 +28,7 @@ SERVERNAME="creation-test"
# shellcheck disable=SC1091
source ./create-instances-common.sh
-for i in $(seq 1 10); do
+for i in $(seq 1 2); do
printf "creating server %s\n" "${SERVERNAME}-${i}"
server_details=$(create_server_and_wait_for_connectivity "${DEVEL}" "${SERVERNAME}-${i}" "${RC_FILE}" "${ARCH}")
show_server_details "${server_details}"
diff --git a/mojo/manifest b/mojo/manifest
index 07c30f6..e9e938f 100644
--- a/mojo/manifest
+++ b/mojo/manifest
@@ -2,6 +2,5 @@ collect
secrets
bundle config=service-bundle wait=True max-wait=1200
script config=make-lxd-secgroup
-script config=postdeploy
script config=rabbitmq-cleanup-setup
script config=dump-lxd-remotes
diff --git a/mojo/service-bundle b/mojo/service-bundle
index 7946db1..858d5af 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -1,5 +1,5 @@
{%- if stage_name == "production" %}
- {%- set releases = "bionic focal jammy mantic noble" %}
+ {%- set releases = "trusty xenial bionic focal jammy mantic noble" %}
{%- set channel = "latest/stable" %}
{%- elif stage_name == "staging" or stage_name == "devel" %}
{%- set releases = "focal jammy mantic noble" %}
@@ -74,7 +74,6 @@ applications:
options:
<<: *common-options
nova-rcs: include-base64://{{local_dir}}/novarcs.tar
- worker-setup-command2: /CHECKOUTDIR//setup-commands/setup-testbed
{%- if stage_name == "production" %}
net-name: net_prod-proposed-migration
worker-default-flavor: autopkgtest
@@ -101,11 +100,11 @@ applications:
lcy02:
amd64: 45
bos01:
- arm64: 26
+ arm64: 20
ppc64el: 20
s390x: 20
bos02:
- arm64: 26
+ arm64: 20
ppc64el: 20
s390x: 22
bos03:
@@ -146,20 +145,24 @@ applications:
{%- if stage_name == "production" %}
lxd-remotes: |-
armhf:
- 10.44.124.95: 3 # lxd-armhf1 @ jojora
+ 10.44.124.16: 3 # lxd-armhf1 @ jojora
10.44.124.99: 3 # lxd-armhf2 @ jojora
10.44.124.111: 3 # lxd-armhf3 @ krusha
10.44.124.112: 3 # lxd-armhf4 @ krusha
+ 10.44.124.15: 3 # lxd-armhf5 @ jojora
10.44.124.162: 3 # lxd-armhf6 @ jojora
- 10.44.124.237: 3 # lxd-armhf8 @ jojora
+ 10.44.124.165: 3 # lxd-armhf7 @ krusha
+ 10.44.124.216: 3 # lxd-armhf8 @ swirlix29
10.44.124.246: 3 # lxd-armhf9 @ krusha
10.44.124.249: 3 # lxd-armhf10 @ jojora
10.44.124.25: 3 # lxd-armhf11 @ krusha
- 10.44.124.206: 3 # lxd-armhf12 @ jojora
+ 10.44.124.180: 3 # lxd-armhf12 @ jojora
10.44.124.24: 3 # lxd-armhf13 @ krusha
10.44.124.240: 3 # lxd-armhf14 @ krusha
10.44.124.253: 3 # lxd-armhf15 @ krusha
+ 10.44.124.170: 3 # lxd-armhf16 @ jojora
10.44.124.26: 3 # lxd-armhf17 @ krusha
+ 10.44.124.243: 3 # lxd-armhf18 @ krusha
{%- elif stage_name == "staging" %}
lxd-remotes: |-
armhf:
@@ -251,7 +254,7 @@ applications:
autocert-haproxy:
charm: autocert
channel: latest/stable
- revision: 43
+ revision: 53
options:
autocert_host: autocert.canonical.com
cert_additional_names: {{ hostname }}=default
diff --git a/mojo/upgrade-charm b/mojo/upgrade-charm
index 9f38cce..cdc8a83 100755
--- a/mojo/upgrade-charm
+++ b/mojo/upgrade-charm
@@ -2,8 +2,6 @@
set -eu
-export JUJU_REPOSITORY="$MOJO_REPO_DIR"
-
echo "Upgrading charms"
for service in $(juju status --format=json | jq -r '.applications | to_entries[] | .key'); do
--
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
