From c83e75385ad1b4bfc9e91d1f20d699fc56895be7 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 16 Aug 2022 19:31:49 -0400 Subject: [PATCH 1/5] Replace cs: with ch: (cherry picked from commit 61e1bad6f040395d3474a162bbc92df9209fe519) --- tests/bundles/first.yaml | 8 +++++--- tests/bundles/second.yaml | 5 +++-- tests/bundles/third.yaml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/bundles/first.yaml b/tests/bundles/first.yaml index 9ebba1609..e4bf0b172 100644 --- a/tests/bundles/first.yaml +++ b/tests/bundles/first.yaml @@ -1,12 +1,14 @@ applications: magpie-xenial: series: xenial - charm: cs:~openstack-charmers-next/magpie + charm: ch:magpie + channel: latest/edge num_units: 2 magpie-bionic: series: bionic - charm: cs:~openstack-charmers-next/magpie + charm: ch:magpie + channel: latest/edge num_units: 2 ubuntu: - charm: cs:ubuntu + charm: ch:ubuntu num_units: 3 diff --git a/tests/bundles/second.yaml b/tests/bundles/second.yaml index 4b8a40147..360269c7e 100644 --- a/tests/bundles/second.yaml +++ b/tests/bundles/second.yaml @@ -1,8 +1,9 @@ applications: magpie-focal: series: focal - charm: cs:~openstack-charmers-next/magpie + charm: ch:magpie + channel: latest/edge num_units: 2 ubuntu: - charm: cs:ubuntu + charm: ch:ubuntu num_units: 3 diff --git a/tests/bundles/third.yaml b/tests/bundles/third.yaml index 06a08d670..44ed8cd32 100644 --- a/tests/bundles/third.yaml +++ b/tests/bundles/third.yaml @@ -1,5 +1,5 @@ applications: ubuntu: - charm: cs:ubuntu + charm: ch:ubuntu num_units: 10 From e2d1ab0c989e9a2d60dc7e0fe042a01606ca99c5 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 16 Aug 2022 19:32:21 -0400 Subject: [PATCH 2/5] Set default series to focal in the testing bundles. (cherry picked from commit e43059ccb76cd89355df6841ba9e7d400e04785f) --- tests/bundles/first.yaml | 1 + tests/bundles/second.yaml | 1 + tests/bundles/third.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/bundles/first.yaml b/tests/bundles/first.yaml index e4bf0b172..cae17102c 100644 --- a/tests/bundles/first.yaml +++ b/tests/bundles/first.yaml @@ -1,3 +1,4 @@ +series: focal applications: magpie-xenial: series: xenial diff --git a/tests/bundles/second.yaml b/tests/bundles/second.yaml index 360269c7e..b4ead7f8f 100644 --- a/tests/bundles/second.yaml +++ b/tests/bundles/second.yaml @@ -1,3 +1,4 @@ +series: focal applications: magpie-focal: series: focal diff --git a/tests/bundles/third.yaml b/tests/bundles/third.yaml index 44ed8cd32..c6294bbc7 100644 --- a/tests/bundles/third.yaml +++ b/tests/bundles/third.yaml @@ -1,3 +1,4 @@ +series: focal applications: ubuntu: charm: ch:ubuntu From 3a4d8cbffe9c8a193d3638ae2579a7592610b1e7 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 16 Aug 2022 20:04:32 -0400 Subject: [PATCH 3/5] Download lxd image before bootstrap The first time deploying a bundle many attempts to download the image will get triggered and the second machine will fail to start and it will get into a retry strategy, downloading the images beforehand allows to avoid this and make the CI runs less unstable. 0 pending pending bionic Retrieving image: rootfs: 65% (22.01MB/s) 1 down pending bionic failed to start machine 1 (Failed remote image download: Alias already exists: juju/bionic/amd64), retrying in 10s (10 more attempts) (cherry picked from commit f1f01dc7744a2a960577eec17389d5138d59090e) --- .github/workflows/tox.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index 7d00a1a1a..0f8b395d3 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -46,6 +46,11 @@ jobs: sudo chmod 666 /var/snap/lxd/common/lxd/unix.socket # until Juju provides stable IPv6-support we unfortunately need this lxc network set lxdbr0 ipv6.address none + # pull images + lxc image copy --alias juju/bionic/amd64 --copy-aliases ubuntu-daily:bionic local: + lxc image copy --alias juju/focal/amd64 --copy-aliases ubuntu-daily:focal local: + lxc image copy --alias juju/jammy/amd64 --copy-aliases ubuntu-daily:jammy local: + lxc image list juju bootstrap --no-gui localhost - name: Functional test run: | From a888a0b4fc766a4c89b87ab19862d049942b37f0 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Tue, 16 Aug 2022 20:21:25 -0400 Subject: [PATCH 4/5] Drop magpie-xenial, add magpie-focal (cherry picked from commit 603199b88d1c99210285893d4e04160dd8632116) --- tests/bundles/first.yaml | 4 ++-- tests/tests.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/bundles/first.yaml b/tests/bundles/first.yaml index cae17102c..7595b3464 100644 --- a/tests/bundles/first.yaml +++ b/tests/bundles/first.yaml @@ -1,7 +1,7 @@ series: focal applications: - magpie-xenial: - series: xenial + magpie-focal: + series: focal charm: ch:magpie channel: latest/edge num_units: 2 diff --git a/tests/tests.yaml b/tests/tests.yaml index 55447409f..22ebf1fbe 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -7,9 +7,6 @@ gate_bundles: - second - third target_deploy_status: - magpie-xenial: - workload-status: active - workload-status-message-prefix: icmp ok, local hostname ok magpie-bionic: workload-status: active workload-status-message-prefix: icmp ok, local hostname ok @@ -21,6 +18,9 @@ target_deploy_status: workload-status-message-prefix: icmp ok, local hostname ok ubuntu: workload-status-message-regex: "^$" + ntp: + workload-status: active + workload-status-message-prefix: 'chrony: Ready' configure: - zaza.charm_tests.noop.setup.basic_setup tests: From bc0c597055a645e7e43d12f57a434242302ca9b5 Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Wed, 17 Aug 2022 09:33:27 -0400 Subject: [PATCH 5/5] Pin aiohttp<4.0.0 aiohttp doesn't compile with the gcc available in Ubuntu Jammy, the error raised is: aiohttp/_http_parser.c:16227:5: error: lvalue required as increment operand (cherry picked from commit 9eb432ebf426bdc3435b8512ee414fad2168acd9) --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index dce640bfe..52a574275 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,7 @@ version = "0.0.1.dev1" install_require = [ + 'aiohttp<4.0.0', # aiohttp/_http_parser.c:16227:5: error: lvalue required as increment operand 'oslo.config<6.12.0', # pin at stable/train to retain Py3.5 support 'async_generator',