Drop "full-model" CI jobs.
The full-model CI jobs deploy a complete OpenStack cloud in HA, although the tests.yaml doesn't include any extra testing, so far this testing hasn't shown any benefits. This patch drops those CI jobs and updates focal and jammy jobs to deploy Keystone in HA, as a way to still have a HA related application to mysql-innodb-cluster. Change-Id: Ie6a9497c1838c66916e3e89544e2674c3206aae8
This commit is contained in:
Felipe Reyes
parent
83bc7b36ae
commit
74a6cb120d
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,6 +9,5 @@ README.ex
|
||||
|
||||
# Remove these
|
||||
src/tests/mysqlsh.snap
|
||||
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
|
||||
manual-attach.sh
|
||||
*.charm
|
||||
|
||||
19
osci.yaml
19
osci.yaml
@ -6,25 +6,8 @@
|
||||
jobs:
|
||||
- focal
|
||||
- jammy
|
||||
- full_model-focal-full-ha
|
||||
- full_model-jammy-full-ha
|
||||
vars:
|
||||
needs_charm_build: true
|
||||
charm_build_name: mysql-innodb-cluster
|
||||
build_type: charmcraft
|
||||
charmcraft_channel: "2.2/stable"
|
||||
|
||||
- job:
|
||||
name: full_model-focal-full-ha
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- focal
|
||||
vars:
|
||||
tox_extra_args: '-- full_model:focal-full-ha'
|
||||
- job:
|
||||
name: full_model-jammy-full-ha
|
||||
parent: func-target
|
||||
dependencies:
|
||||
- jammy
|
||||
vars:
|
||||
tox_extra_args: '-- full_model:jammy-full-ha'
|
||||
charmcraft_channel: "2.x/stable"
|
||||
|
||||
@ -1 +0,0 @@
|
||||
focal-full.yaml
|
||||
@ -1,179 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro-proposed
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
series: &series focal
|
||||
|
||||
applications:
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ../../../mysql-innodb-cluster_ubuntu-20.04-amd64.charm
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: 3.8/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: 1.7/edge
|
||||
ovn-central:
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: 22.03/edge
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
channel: yoga/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: latest/stable
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
config-flags: default_ephemeral_format=ext4
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
memcached:
|
||||
charm: ch:memcached
|
||||
num_units: 1
|
||||
relations:
|
||||
- - neutron-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:identity-service
|
||||
- keystone:identity-service
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - placement:identity-service
|
||||
- keystone:identity-service
|
||||
- - placement:placement
|
||||
- nova-cloud-controller:placement
|
||||
- - neutron-api-plugin-ovn:neutron-plugin
|
||||
- neutron-api:neutron-plugin-api-subordinate
|
||||
- - ovn-central:certificates
|
||||
- vault:certificates
|
||||
- - ovn-central:ovsdb-cms
|
||||
- neutron-api-plugin-ovn:ovsdb-cms
|
||||
- - neutron-api:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:nova-compute
|
||||
- nova-compute:neutron-plugin
|
||||
- - ovn-chassis:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - vault:certificates
|
||||
- neutron-api-plugin-ovn:certificates
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault:certificates
|
||||
- mysql-innodb-cluster:certificates
|
||||
- - memcached:cache
|
||||
- nova-cloud-controller:memcache
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - glance:shared-db
|
||||
- glance-mysql-router:shared-db
|
||||
- - nova-cloud-controller:shared-db
|
||||
- nova-mysql-router:shared-db
|
||||
- - neutron-api:shared-db
|
||||
- neutron-mysql-router:shared-db
|
||||
- - placement:shared-db
|
||||
- placement-mysql-router:shared-db
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - nova-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - glance-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - neutron-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - placement-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
@ -1,4 +1,4 @@
|
||||
local_overlay_enabled: False
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: focal
|
||||
applications:
|
||||
@ -16,8 +16,11 @@ applications:
|
||||
prometheus-exporter-snap-channel: edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
num_units: 3
|
||||
channel: yoga/edge
|
||||
keystone-hacluster:
|
||||
charm: ch:hacluster
|
||||
channel: 2.0.3/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
@ -40,3 +43,5 @@ relations:
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - prometheus2:target
|
||||
- mysql-innodb-cluster:prometheus
|
||||
- - "keystone:ha"
|
||||
- "keystone-hacluster:ha"
|
||||
|
||||
@ -1 +0,0 @@
|
||||
jammy-full.yaml
|
||||
@ -1,179 +0,0 @@
|
||||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
local_overlay_enabled: False
|
||||
|
||||
series: &series jammy
|
||||
|
||||
applications:
|
||||
keystone-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
nova-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
glance-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
neutron-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
placement-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
vault-mysql-router:
|
||||
charm: ch:mysql-router
|
||||
channel: latest/edge
|
||||
mysql-innodb-cluster:
|
||||
charm: ../../../mysql-innodb-cluster_ubuntu-22.04-amd64.charm
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
rabbitmq-server:
|
||||
charm: ch:rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: 3.9/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
channel: 1.7/edge
|
||||
ovn-central:
|
||||
charm: ch:ovn-central
|
||||
num_units: 3
|
||||
options:
|
||||
source: *openstack-origin
|
||||
channel: 22.03/edge
|
||||
neutron-api-plugin-ovn:
|
||||
charm: ch:neutron-api-plugin-ovn
|
||||
channel: yoga/edge
|
||||
neutron-api:
|
||||
charm: ch:neutron-api
|
||||
series: *series
|
||||
num_units: 1
|
||||
options:
|
||||
flat-network-providers: physnet1
|
||||
neutron-security-groups: true
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
glance:
|
||||
charm: ch:glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
nova-cloud-controller:
|
||||
charm: ch:nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
network-manager: Neutron
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
ovn-chassis:
|
||||
charm: ch:ovn-chassis
|
||||
channel: 22.03/edge
|
||||
nova-compute:
|
||||
charm: ch:nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
config-flags: default_ephemeral_format=ext4
|
||||
enable-live-migration: true
|
||||
enable-resize: true
|
||||
migration-auth-type: ssh
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
placement:
|
||||
charm: ch:placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: *openstack-origin
|
||||
channel: yoga/edge
|
||||
memcached:
|
||||
charm: cs:memcached
|
||||
num_units: 1
|
||||
relations:
|
||||
- - neutron-api:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - neutron-api:neutron-api
|
||||
- nova-cloud-controller:neutron-api
|
||||
- - neutron-api:identity-service
|
||||
- keystone:identity-service
|
||||
- - nova-cloud-controller:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-cloud-controller:identity-service
|
||||
- keystone:identity-service
|
||||
- - nova-cloud-controller:cloud-compute
|
||||
- nova-compute:cloud-compute
|
||||
- - glance:identity-service
|
||||
- keystone:identity-service
|
||||
- - glance:amqp
|
||||
- rabbitmq-server:amqp
|
||||
- - nova-compute:image-service
|
||||
- glance:image-service
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - placement:identity-service
|
||||
- keystone:identity-service
|
||||
- - placement:placement
|
||||
- nova-cloud-controller:placement
|
||||
- - neutron-api-plugin-ovn:neutron-plugin
|
||||
- neutron-api:neutron-plugin-api-subordinate
|
||||
- - ovn-central:certificates
|
||||
- vault:certificates
|
||||
- - ovn-central:ovsdb-cms
|
||||
- neutron-api-plugin-ovn:ovsdb-cms
|
||||
- - neutron-api:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:nova-compute
|
||||
- nova-compute:neutron-plugin
|
||||
- - ovn-chassis:certificates
|
||||
- vault:certificates
|
||||
- - ovn-chassis:ovsdb
|
||||
- ovn-central:ovsdb
|
||||
- - vault:certificates
|
||||
- neutron-api-plugin-ovn:certificates
|
||||
- - vault:certificates
|
||||
- glance:certificates
|
||||
- - vault:certificates
|
||||
- keystone:certificates
|
||||
- - vault:certificates
|
||||
- nova-cloud-controller:certificates
|
||||
- - vault:certificates
|
||||
- placement:certificates
|
||||
- - vault:certificates
|
||||
- mysql-innodb-cluster:certificates
|
||||
- - memcached:cache
|
||||
- nova-cloud-controller:memcache
|
||||
- - keystone:shared-db
|
||||
- keystone-mysql-router:shared-db
|
||||
- - glance:shared-db
|
||||
- glance-mysql-router:shared-db
|
||||
- - nova-cloud-controller:shared-db
|
||||
- nova-mysql-router:shared-db
|
||||
- - neutron-api:shared-db
|
||||
- neutron-mysql-router:shared-db
|
||||
- - placement:shared-db
|
||||
- placement-mysql-router:shared-db
|
||||
- - vault:shared-db
|
||||
- vault-mysql-router:shared-db
|
||||
- - keystone-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - nova-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - glance-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - neutron-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - placement-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - vault-mysql-router:db-router
|
||||
- mysql-innodb-cluster:db-router
|
||||
@ -1,4 +1,4 @@
|
||||
local_overlay_enabled: False
|
||||
local_overlay_enabled: True
|
||||
|
||||
series: jammy
|
||||
applications:
|
||||
@ -15,8 +15,11 @@ applications:
|
||||
prometheus-exporter-snap-channel: edge
|
||||
keystone:
|
||||
charm: ch:keystone
|
||||
num_units: 1
|
||||
num_units: 3
|
||||
channel: yoga/edge
|
||||
keystone-hacluster:
|
||||
charm: ch:hacluster
|
||||
channel: 2.4/edge
|
||||
vault:
|
||||
charm: ch:vault
|
||||
num_units: 1
|
||||
@ -40,3 +43,5 @@ relations:
|
||||
- mysql-innodb-cluster:db-router
|
||||
- - prometheus2:target
|
||||
- mysql-innodb-cluster:prometheus
|
||||
- - "keystone:ha"
|
||||
- "keystone-hacluster:ha"
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
applications:
|
||||
keystone:
|
||||
num_units: 3
|
||||
options:
|
||||
vip: {{TEST_VIP00}}
|
||||
nova-cloud-controller:
|
||||
num_units: 3
|
||||
options:
|
||||
vip: {{TEST_VIP01}}
|
||||
keystone-hacluster:
|
||||
series: focal
|
||||
charm: ch:hacluster
|
||||
channel: 2.0.3/edge
|
||||
nova-hacluster:
|
||||
series: focal
|
||||
charm: ch:hacluster
|
||||
channel: 2.0.3/edge
|
||||
relations:
|
||||
- ["keystone:ha", "keystone-hacluster:ha"]
|
||||
- ["nova-cloud-controller:ha", "nova-hacluster:ha"]
|
||||
@ -1,20 +0,0 @@
|
||||
applications:
|
||||
keystone:
|
||||
num_units: 3
|
||||
options:
|
||||
vip: {{TEST_VIP00}}
|
||||
nova-cloud-controller:
|
||||
num_units: 3
|
||||
options:
|
||||
vip: {{TEST_VIP01}}
|
||||
keystone-hacluster:
|
||||
series: jammy
|
||||
charm: ch:hacluster
|
||||
channel: 2.4/edge
|
||||
nova-hacluster:
|
||||
series: jammy
|
||||
charm: ch:hacluster
|
||||
channel: 2.4/edge
|
||||
relations:
|
||||
- ["keystone:ha", "keystone-hacluster:ha"]
|
||||
- ["nova-cloud-controller:ha", "nova-hacluster:ha"]
|
||||
4
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
Normal file
4
src/tests/bundles/overlays/local-charm-overlay.yaml.j2
Normal file
@ -0,0 +1,4 @@
|
||||
applications:
|
||||
keystone:
|
||||
options:
|
||||
vip: {{TEST_VIP00}}
|
||||
@ -3,13 +3,6 @@ charm_name: mysql-innodb-cluster
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- full_model:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
- zaza.openstack.charm_tests.glance.setup.add_lts_image
|
||||
- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
|
||||
- zaza.openstack.charm_tests.nova.setup.create_flavors
|
||||
- zaza.openstack.charm_tests.nova.setup.manage_ssh_key
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
- scale_in_out:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
- zaza.openstack.charm_tests.keystone.setup.add_demo_user
|
||||
@ -18,10 +11,6 @@ tests:
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterTests
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterRotatePasswordTests
|
||||
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
|
||||
- full_model:
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterTests
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterRotatePasswordTests
|
||||
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
|
||||
- scale_in_out:
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterColdStartTest
|
||||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterScaleTest
|
||||
@ -32,29 +21,17 @@ tests:
|
||||
gate_bundles:
|
||||
- scale_in_out: focal
|
||||
- scale_in_out: jammy
|
||||
- full_model: focal-full-ha
|
||||
- full_model: jammy-full-ha
|
||||
|
||||
smoke_bundles:
|
||||
- focal
|
||||
|
||||
dev_bundles:
|
||||
- scale_in_out: jammy
|
||||
- full_model: jammy-full-ha
|
||||
|
||||
tests_options:
|
||||
force_deploy: []
|
||||
|
||||
target_deploy_status:
|
||||
neutron-api-plugin-ovn:
|
||||
workload-status: waiting
|
||||
workload-status-message-prefix: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete"
|
||||
ovn-central:
|
||||
workload-status: waiting
|
||||
workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data"
|
||||
ovn-chassis:
|
||||
workload-status: waiting
|
||||
workload-status-message-prefix: "'certificates' awaiting server certificate data"
|
||||
vault:
|
||||
workload-status: blocked
|
||||
workload-status-message-prefix: Vault needs to be initialized
|
||||
|
||||
Loading…
Reference in New Issue
Block a user