build(juju-3.1): Drop bionic and change zaza dependency to branch lib…

…juju-3.1 Reviewed-on: https://code.launchpad.net/~jneo8/charm-duplicity/+git/charm-duplicity/+merge/452886 Reviewed-by: Eric Chen <[email protected]> Reviewed-by: 🤖 prod-jenkaas-bootstack <[email protected]> Reviewed-by: Tianqi Xiao <[email protected]>
canonical · Oct 11, 2023 · 741f6a3 · 741f6a3
2 parents 36ee558 + 4a108d1
commit 741f6a3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 8 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -23,7 +23,3 @@ bases:
           channel: "20.04"
           architectures:
               - amd64
-        - name: ubuntu
-          channel: "18.04"
-          architectures:
-              - amd64
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
@@ -1,4 +1,4 @@
 flake8
 mock
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
+git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
 python-openstackclient
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
@@ -18,7 +18,6 @@ configure:
 gate_bundles:
   - jammy
   - focal
-  - bionic
 dev_bundles:
   - jammy
   - focal
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ configure: @@
     gate_bundles:
       - jammy
       - focal
-      - bionic
     dev_bundles:
       - jammy
       - focal
@@ Expand Down @@