From fcd2cf09503f23b01d3cc148b450d606eb2bfb3c Mon Sep 17 00:00:00 2001 From: Felipe Reyes Date: Wed, 27 Sep 2023 17:11:00 -0300 Subject: [PATCH] Standardise CI job names Drop the 'test-s3api-' prefix from the CI jobs since the global region testing was removed by commit 733f8d979130. This change allows to rely on the standard CI job templates defined by zosci-config. There is a set of overlays that were used by the global region testing that gets dropped since they are no longer being used. Change-Id: I3c7c456a34cea4999ef637e1ad3e46395a993941 --- osci.yaml | 44 +------------------ .../bundles/overlays/focal-xena-gr-r1.yaml.j2 | 28 ------------ .../bundles/overlays/focal-xena-gr-r2.yaml.j2 | 31 ------------- .../bundles/overlays/focal-yoga-gr-r1.yaml.j2 | 28 ------------ .../bundles/overlays/focal-yoga-gr-r2.yaml.j2 | 31 ------------- .../bundles/overlays/jammy-yoga-gr-r1.yaml.j2 | 28 ------------ .../bundles/overlays/jammy-yoga-gr-r2.yaml.j2 | 31 ------------- .../bundles/overlays/jammy-zed-gr-r1.yaml.j2 | 28 ------------ .../bundles/overlays/jammy-zed-gr-r2.yaml.j2 | 31 ------------- tests/tests.yaml | 9 +--- 10 files changed, 3 insertions(+), 286 deletions(-) delete mode 100644 tests/bundles/overlays/focal-xena-gr-r1.yaml.j2 delete mode 100644 tests/bundles/overlays/focal-xena-gr-r2.yaml.j2 delete mode 100644 tests/bundles/overlays/focal-yoga-gr-r1.yaml.j2 delete mode 100644 tests/bundles/overlays/focal-yoga-gr-r2.yaml.j2 delete mode 100644 tests/bundles/overlays/jammy-yoga-gr-r1.yaml.j2 delete mode 100644 tests/bundles/overlays/jammy-yoga-gr-r2.yaml.j2 delete mode 100644 tests/bundles/overlays/jammy-zed-gr-r1.yaml.j2 delete mode 100644 tests/bundles/overlays/jammy-zed-gr-r2.yaml.j2 diff --git a/osci.yaml b/osci.yaml index 226b158..60d9f0c 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,49 +1,9 @@ - project: templates: - charm-unit-jobs-py310 - check: - jobs: - - test-s3api-jammy-antelope - - test-s3api-jammy-bobcat: - voting: false - - test-s3api-lunar-antelope: - voting: false - - test-s3api-mantic-bobcat: - voting: false + - charm-functional-jobs vars: needs_charm_build: true charm_build_name: swift-proxy build_type: charmcraft - charmcraft_channel: 2.1/stable - -- job: - name: test-s3api-jammy-antelope - parent: func-target - dependencies: - - charm-build - - osci-lint - - name: tox-py310 - soft: true - vars: - tox_extra_args: '-- test-s3api:jammy-antelope' -- job: - name: test-s3api-jammy-bobcat - parent: func-target - dependencies: - - test-s3api-jammy-antelope - vars: - tox_extra_args: '-- test-s3api:jammy-bobcat' -- job: - name: test-s3api-lunar-antelope - parent: func-target - dependencies: - - test-s3api-jammy-antelope - vars: - tox_extra_args: '-- test-s3api:lunar-antelope' -- job: - name: test-s3api-mantic-bobcat - parent: func-target - dependencies: - - test-s3api-jammy-antelope - vars: - tox_extra_args: '-- test-s3api:mantic-bobcat' + charmcraft_channel: 2.x/stable diff --git a/tests/bundles/overlays/focal-xena-gr-r1.yaml.j2 b/tests/bundles/overlays/focal-xena-gr-r1.yaml.j2 deleted file mode 100644 index 5e142a9..0000000 --- a/tests/bundles/overlays/focal-xena-gr-r1.yaml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -applications: - keystone: - offers: - keystone: - endpoints: - - identity-service - swift-proxy-region1: - charm: {{ charm_location }} - offers: - swift-proxy-region1: - endpoints: - - swift-storage - - rings-distributor - swift-storage-region1-zone1: - offers: - swift-storage-region1-zone1: - endpoints: - - swift-storage - swift-storage-region1-zone2: - offers: - swift-storage-region1-zone2: - endpoints: - - swift-storage - swift-storage-region1-zone3: - offers: - swift-storage-region1-zone3: - endpoints: - - swift-storage diff --git a/tests/bundles/overlays/focal-xena-gr-r2.yaml.j2 b/tests/bundles/overlays/focal-xena-gr-r2.yaml.j2 deleted file mode 100644 index 689e703..0000000 --- a/tests/bundles/overlays/focal-xena-gr-r2.yaml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -applications: - swift-proxy-region2: - charm: {{ charm_location }} -relations: -- - swift-proxy-region2:identity-service - - keystone:identity-service -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone1:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone2:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone3:swift-storage -- - swift-storage-region2-zone1:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone2:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone3:swift-storage - - swift-proxy-region1:swift-storage -- - swift-proxy-region2:rings-consumer - - swift-proxy-region1:rings-distributor -saas: - keystone: - url: admin/{{ swift_gr_region1 }}.keystone - swift-proxy-region1: - url: admin/{{ swift_gr_region1 }}.swift-proxy-region1 - swift-storage-region1-zone1: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1 - swift-storage-region1-zone2: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2 - swift-storage-region1-zone3: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3 diff --git a/tests/bundles/overlays/focal-yoga-gr-r1.yaml.j2 b/tests/bundles/overlays/focal-yoga-gr-r1.yaml.j2 deleted file mode 100644 index 5e142a9..0000000 --- a/tests/bundles/overlays/focal-yoga-gr-r1.yaml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -applications: - keystone: - offers: - keystone: - endpoints: - - identity-service - swift-proxy-region1: - charm: {{ charm_location }} - offers: - swift-proxy-region1: - endpoints: - - swift-storage - - rings-distributor - swift-storage-region1-zone1: - offers: - swift-storage-region1-zone1: - endpoints: - - swift-storage - swift-storage-region1-zone2: - offers: - swift-storage-region1-zone2: - endpoints: - - swift-storage - swift-storage-region1-zone3: - offers: - swift-storage-region1-zone3: - endpoints: - - swift-storage diff --git a/tests/bundles/overlays/focal-yoga-gr-r2.yaml.j2 b/tests/bundles/overlays/focal-yoga-gr-r2.yaml.j2 deleted file mode 100644 index 689e703..0000000 --- a/tests/bundles/overlays/focal-yoga-gr-r2.yaml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -applications: - swift-proxy-region2: - charm: {{ charm_location }} -relations: -- - swift-proxy-region2:identity-service - - keystone:identity-service -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone1:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone2:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone3:swift-storage -- - swift-storage-region2-zone1:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone2:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone3:swift-storage - - swift-proxy-region1:swift-storage -- - swift-proxy-region2:rings-consumer - - swift-proxy-region1:rings-distributor -saas: - keystone: - url: admin/{{ swift_gr_region1 }}.keystone - swift-proxy-region1: - url: admin/{{ swift_gr_region1 }}.swift-proxy-region1 - swift-storage-region1-zone1: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1 - swift-storage-region1-zone2: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2 - swift-storage-region1-zone3: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3 diff --git a/tests/bundles/overlays/jammy-yoga-gr-r1.yaml.j2 b/tests/bundles/overlays/jammy-yoga-gr-r1.yaml.j2 deleted file mode 100644 index 5e142a9..0000000 --- a/tests/bundles/overlays/jammy-yoga-gr-r1.yaml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -applications: - keystone: - offers: - keystone: - endpoints: - - identity-service - swift-proxy-region1: - charm: {{ charm_location }} - offers: - swift-proxy-region1: - endpoints: - - swift-storage - - rings-distributor - swift-storage-region1-zone1: - offers: - swift-storage-region1-zone1: - endpoints: - - swift-storage - swift-storage-region1-zone2: - offers: - swift-storage-region1-zone2: - endpoints: - - swift-storage - swift-storage-region1-zone3: - offers: - swift-storage-region1-zone3: - endpoints: - - swift-storage diff --git a/tests/bundles/overlays/jammy-yoga-gr-r2.yaml.j2 b/tests/bundles/overlays/jammy-yoga-gr-r2.yaml.j2 deleted file mode 100644 index 689e703..0000000 --- a/tests/bundles/overlays/jammy-yoga-gr-r2.yaml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -applications: - swift-proxy-region2: - charm: {{ charm_location }} -relations: -- - swift-proxy-region2:identity-service - - keystone:identity-service -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone1:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone2:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone3:swift-storage -- - swift-storage-region2-zone1:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone2:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone3:swift-storage - - swift-proxy-region1:swift-storage -- - swift-proxy-region2:rings-consumer - - swift-proxy-region1:rings-distributor -saas: - keystone: - url: admin/{{ swift_gr_region1 }}.keystone - swift-proxy-region1: - url: admin/{{ swift_gr_region1 }}.swift-proxy-region1 - swift-storage-region1-zone1: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1 - swift-storage-region1-zone2: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2 - swift-storage-region1-zone3: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3 diff --git a/tests/bundles/overlays/jammy-zed-gr-r1.yaml.j2 b/tests/bundles/overlays/jammy-zed-gr-r1.yaml.j2 deleted file mode 100644 index 5e142a9..0000000 --- a/tests/bundles/overlays/jammy-zed-gr-r1.yaml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -applications: - keystone: - offers: - keystone: - endpoints: - - identity-service - swift-proxy-region1: - charm: {{ charm_location }} - offers: - swift-proxy-region1: - endpoints: - - swift-storage - - rings-distributor - swift-storage-region1-zone1: - offers: - swift-storage-region1-zone1: - endpoints: - - swift-storage - swift-storage-region1-zone2: - offers: - swift-storage-region1-zone2: - endpoints: - - swift-storage - swift-storage-region1-zone3: - offers: - swift-storage-region1-zone3: - endpoints: - - swift-storage diff --git a/tests/bundles/overlays/jammy-zed-gr-r2.yaml.j2 b/tests/bundles/overlays/jammy-zed-gr-r2.yaml.j2 deleted file mode 100644 index 689e703..0000000 --- a/tests/bundles/overlays/jammy-zed-gr-r2.yaml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -applications: - swift-proxy-region2: - charm: {{ charm_location }} -relations: -- - swift-proxy-region2:identity-service - - keystone:identity-service -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone1:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone2:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone3:swift-storage -- - swift-storage-region2-zone1:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone2:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone3:swift-storage - - swift-proxy-region1:swift-storage -- - swift-proxy-region2:rings-consumer - - swift-proxy-region1:rings-distributor -saas: - keystone: - url: admin/{{ swift_gr_region1 }}.keystone - swift-proxy-region1: - url: admin/{{ swift_gr_region1 }}.swift-proxy-region1 - swift-storage-region1-zone1: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1 - swift-storage-region1-zone2: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2 - swift-storage-region1-zone3: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3 diff --git a/tests/tests.yaml b/tests/tests.yaml index 279f467..6aa6a41 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -9,7 +9,6 @@ dev_bundles: - test-s3api: mantic-bobcat smoke_bundles: - # Use no s3api test for smoke - jammy-antelope configure: @@ -19,13 +18,7 @@ configure: tests: - zaza.openstack.charm_tests.swift.tests.SwiftImageCreateTest - zaza.openstack.charm_tests.swift.tests.SwiftProxyTests - - test-s3api: - - zaza.openstack.charm_tests.swift.tests.SwiftImageCreateTest - - zaza.openstack.charm_tests.swift.tests.SwiftProxyTests - - zaza.openstack.charm_tests.swift.tests.S3APITest - - swift_gr_region1: - - zaza.openstack.charm_tests.swift.tests.SwiftGlobalReplicationTests - - zaza.openstack.charm_tests.swift.tests.SwiftProxyMultiZoneTests + - zaza.openstack.charm_tests.swift.tests.S3APITest tests_options: force_deploy: