Merge "Enable the focal and ussuri tests in the gate test"

src/metadata.yaml

@@ -16,6 +16,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 subordinate: false
 requires:

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,121 @@
+variables:
+  openstack-origin: &openstack-origin cloud:bionic-ussuri
+
+series: &series bionic
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1:
+  2:
+  3:
+  4:
+  5:
+  6:
+  7:
+  8:
+  9:
+  10:
+  11:
+  12:
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+  aodh:
+    series: *series
+    charm: ../../../aodh
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '1'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '2'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+  ceilometer:
+    charm: cs:~openstack-charmers-next/ceilometer
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '5'
+      - '6'
+      - '7'
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      monitor-count: '3'
+      source: *openstack-origin
+    to:
+      - '8'
+      - '9'
+      - '10'
+  gnocchi:
+    charm: cs:~openstack-charmers-next/gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '11'
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    to:
+      - '12'
+relations:
+  - - 'keystone:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'aodh:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'aodh:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'aodh:identity-service'
+    - 'keystone:identity-service'
+  - - 'ceilometer:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'ceilometer:identity-credentials'
+    - 'keystone:identity-credentials'
+  - - 'ceilometer:identity-notifications'
+    - 'keystone:identity-notifications'
+  - - 'ceilometer:metric-service'
+    - 'gnocchi:metric-service'
+  - - 'gnocchi:identity-service'
+    - 'keystone:identity-service'
+  - - 'gnocchi:shared-db'
+    - 'percona-cluster:shared-db'
+  - - 'gnocchi:storage-ceph'
+    - 'ceph-mon:client'
+  - - 'gnocchi:coordinator-memcached'
+    - 'memcached:cache'

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,164 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: focal
+
+machines:
+  0:
+    constraints: "mem=3072M"
+  1:
+    constraints: "mem=3072M"
+  2:
+    constraints: "mem=3072M"
+  3:
+  4:
+  5:
+  6:
+  7:
+  8:
+  9:
+  10:
+  11:
+  12:
+  13:
+  14:
+    series: bionic
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  aodh-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  gnocchi-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  aodh:
+    charm: ../../../aodh
+    num_units: 1
+    to:
+      - '3'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '4'
+    options:
+      source: *openstack-origin
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  ceilometer:
+    charm: cs:~openstack-charmers-next/ceilometer
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+      - '8'
+      - '9'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      monitor-count: '3'
+      source: *openstack-origin
+    to:
+      - '10'
+      - '11'
+      - '12'
+
+  gnocchi:
+    charm: cs:~openstack-charmers-next/gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # Note that holding memcached at bionic as it's not available at focal yet.
+    series: bionic
+    to:
+      - '14'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - 'aodh:shared-db'
+    - 'aodh-mysql-router:shared-db'
+  - - 'aodh-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'aodh:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'aodh:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'ceilometer:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'ceilometer:identity-credentials'
+    - 'keystone:identity-credentials'
+
+  - - 'ceilometer:identity-notifications'
+    - 'keystone:identity-notifications'
+
+  - - 'ceilometer:metric-service'
+    - 'gnocchi:metric-service'
+
+  - - 'gnocchi:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'gnocchi:shared-db'
+    - 'gnocchi-mysql-router:shared-db'
+  - - 'gnocchi-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'gnocchi:storage-ceph'
+    - 'ceph-mon:client'
+
+  - - 'gnocchi:coordinator-memcached'
+    - 'memcached:cache'

src/tests/tests.yaml

@@ -9,6 +9,8 @@ gate_bundles:
   - bionic-rocky
   - bionic-stein
   - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
   - trusty-mitaka
 smoke_bundles:
   - bionic-train
@@ -25,4 +27,6 @@ target_deploy_status:
   mongodb:
     workload-status: unknown
     workload-status-message: ''
-
+tests_options:
+  force_deploy:
+    - focal-ussuri