Standardise CI job names
Drop the 'test-s3api-' prefix from the CI jobs since the global region
testing was removed by commit 733f8d9791. 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
This commit is contained in:
Felipe Reyes
parent
fb1a1bbcf7
commit
fcd2cf0950
44
osci.yaml
44
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue