Updates for caracal testing support
These updates, on the master branch, are to support testing the caracal packages and support of the charms for caracal. They do NOT lock the charms down, and don't change the testing branches to stable branches. Change-Id: I2dbb764d39c8fc95ec9bf4acb621d02f6174940a
This commit is contained in:
parent
4ebb43d731
commit
ee12af86c9
|
@ -32,9 +32,3 @@ bases:
|
|||
- name: ubuntu
|
||||
channel: "22.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "23.04"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
- name: ubuntu
|
||||
channel: "23.10"
|
||||
architectures: [amd64, s390x, ppc64el, arm64]
|
||||
|
|
|
@ -545,7 +545,7 @@ class IdentityServiceContext(OSContextGenerator):
|
|||
'internal_auth_url': internal_auth_url,
|
||||
})
|
||||
|
||||
# we keep all veriables in ctxt for compatibility and
|
||||
# we keep all variables in ctxt for compatibility and
|
||||
# add nested dictionary for keystone_authtoken generic
|
||||
# templating
|
||||
if keystonemiddleware_os_release:
|
||||
|
@ -557,6 +557,7 @@ class IdentityServiceContext(OSContextGenerator):
|
|||
# NOTE(jamespage) this is required for >= icehouse
|
||||
# so a missing value just indicates keystone needs
|
||||
# upgrading
|
||||
ctxt['admin_user_id'] = _resolve('service_user_id')
|
||||
ctxt['admin_tenant_id'] = _resolve('service_tenant_id')
|
||||
ctxt['admin_domain_id'] = _resolve('service_domain_id')
|
||||
return ctxt
|
||||
|
|
|
@ -161,6 +161,7 @@ OPENSTACK_CODENAMES = OrderedDict([
|
|||
('2022.2', 'zed'),
|
||||
('2023.1', 'antelope'),
|
||||
('2023.2', 'bobcat'),
|
||||
('2024.1', 'caracal'),
|
||||
])
|
||||
|
||||
# The ugly duckling - must list releases oldest to newest
|
||||
|
|
|
@ -246,6 +246,14 @@ CLOUD_ARCHIVE_POCKETS = {
|
|||
'bobcat/proposed': 'jammy-proposed/bobcat',
|
||||
'jammy-bobcat/proposed': 'jammy-proposed/bobcat',
|
||||
'jammy-proposed/bobcat': 'jammy-proposed/bobcat',
|
||||
# caracal
|
||||
'caracal': 'jammy-updates/caracal',
|
||||
'jammy-caracal': 'jammy-updates/caracal',
|
||||
'jammy-caracal/updates': 'jammy-updates/caracal',
|
||||
'jammy-updates/caracal': 'jammy-updates/caracal',
|
||||
'caracal/proposed': 'jammy-proposed/caracal',
|
||||
'jammy-caracal/proposed': 'jammy-proposed/caracal',
|
||||
'jammy-proposed/caracal': 'jammy-proposed/caracal',
|
||||
|
||||
# OVN
|
||||
'focal-ovn-22.03': 'focal-updates/ovn-22.03',
|
||||
|
@ -279,6 +287,7 @@ OPENSTACK_RELEASES = (
|
|||
'zed',
|
||||
'antelope',
|
||||
'bobcat',
|
||||
'caracal',
|
||||
)
|
||||
|
||||
|
||||
|
@ -308,6 +317,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
|
|||
('kinetic', 'zed'),
|
||||
('lunar', 'antelope'),
|
||||
('mantic', 'bobcat'),
|
||||
('noble', 'caracal'),
|
||||
])
|
||||
|
||||
|
||||
|
|
|
@ -15,12 +15,10 @@ description: |
|
|||
This charm deploys the Swift proxy service, providing HTTP based access
|
||||
onto underlying Swift storage services.
|
||||
tags:
|
||||
- openstack
|
||||
- cache-proxy
|
||||
- openstack
|
||||
- cache-proxy
|
||||
series:
|
||||
- jammy
|
||||
- lunar
|
||||
- mantic
|
||||
- jammy
|
||||
extra-bindings:
|
||||
public:
|
||||
admin:
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
needs_charm_build: true
|
||||
charm_build_name: swift-proxy
|
||||
build_type: charmcraft
|
||||
charmcraft_channel: 2.1/stable
|
||||
charmcraft_channel: 2.x/stable
|
||||
|
||||
- job:
|
||||
name: test-s3api-jammy-antelope
|
||||
|
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ../../swift-proxy.charm
|
||||
|
@ -66,7 +66,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-storage:
|
||||
charm: ch:swift-storage
|
||||
|
@ -78,7 +78,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ../../swift-proxy.charm
|
||||
|
@ -66,7 +66,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-storage:
|
||||
charm: ch:swift-storage
|
||||
|
@ -78,7 +78,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
openstack-origin: &openstack-origin cloud:jammy-caracal
|
||||
|
||||
series: mantic
|
||||
series: jammy
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ../../swift-proxy.charm
|
||||
|
@ -66,7 +66,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-storage:
|
||||
charm: ch:swift-storage
|
||||
|
@ -78,7 +78,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
series: lunar
|
||||
series: nobel
|
||||
|
||||
comment:
|
||||
- 'machines section to decide order of deployment. database sooner = faster'
|
||||
|
@ -45,7 +45,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '3'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-proxy:
|
||||
charm: ../../swift-proxy.charm
|
||||
|
@ -66,7 +66,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '5'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
swift-storage:
|
||||
charm: ch:swift-storage
|
||||
|
@ -78,7 +78,7 @@ applications:
|
|||
openstack-origin: *openstack-origin
|
||||
to:
|
||||
- '6'
|
||||
channel: latest/edge
|
||||
channel: 2024.1/edge
|
||||
|
||||
relations:
|
||||
|
|
@ -1,35 +1,31 @@
|
|||
charm_name: swift-proxy
|
||||
|
||||
gate_bundles:
|
||||
- test-s3api: jammy-antelope
|
||||
|
||||
- jammy-antelope
|
||||
- jammy-bobcat
|
||||
- jammy-caracal
|
||||
dev_bundles:
|
||||
- test-s3api: jammy-bobcat
|
||||
- test-s3api: lunar-antelope
|
||||
- test-s3api: mantic-bobcat
|
||||
|
||||
- nobel-caracal
|
||||
smoke_bundles:
|
||||
# Use no s3api test for smoke
|
||||
- jammy-antelope
|
||||
|
||||
- jammy-caracal
|
||||
configure:
|
||||
- swift_gr_region1:
|
||||
- zaza.openstack.charm_tests.swift.setup.wait_for_region2
|
||||
- zaza.openstack.charm_tests.swift.setup.wait_for_region2
|
||||
|
||||
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
|
||||
- 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.SwiftGlobalReplicationTests
|
||||
- zaza.openstack.charm_tests.swift.tests.SwiftProxyMultiZoneTests
|
||||
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- lunar-antelope
|
||||
- mantic-bobcat
|
||||
- nobel-caracal
|
||||
policyd:
|
||||
- service: swift
|
||||
|
|
Loading…
Reference in New Issue