Merge "Enable bionic/stein and disco/stein functional tests"

src/tests/bundles/bionic-stein.yaml

@@ -0,0 +1,146 @@
+series: bionic
+relations:
+- - nova-cloud-controller:nova-cell-api
+  - nova-cell-controller-cell2:nova-cell-compute
+- - nova-cloud-controller:shared-db-cell
+  - mysql-cell2:shared-db
+- - nova-cloud-controller:amqp-cell
+  - rabbitmq-server-nova-cell2:amqp
+- - nova-compute-cell2:amqp
+  - rabbitmq-server-nova-cell2:amqp
+- - neutron-gateway:amqp
+  - rabbitmq-server-neutron:amqp
+- - neutron-gateway:amqp-nova
+  - rabbitmq-server-nova:amqp
+- - keystone:shared-db
+  - mysql:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-openvswitch:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - neutron-api:shared-db
+  - mysql:shared-db
+- - neutron-api:amqp
+  - rabbitmq-server-neutron:amqp
+- - neutron-gateway:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:amqp
+  - rabbitmq-server-neutron:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-compute-cell2:image-service
+  - glance:image-service
+- - nova-cell-controller-cell2:cloud-compute
+  - nova-compute-cell2:cloud-compute
+- - nova-cloud-controller:amqp
+  - rabbitmq-server-nova:amqp
+- - nova-cell-controller-cell2:amqp
+  - rabbitmq-server-nova-cell2:amqp
+- - nova-cloud-controller:quantum-network-service
+  - neutron-gateway:quantum-network-service
+- - nova-compute-cell2:neutron-plugin
+  - neutron-openvswitch:neutron-plugin
+- - neutron-openvswitch:amqp
+  - rabbitmq-server-neutron:amqp
+- - nova-cloud-controller:shared-db
+  - mysql:shared-db
+- - nova-cell-controller-cell2:shared-db
+  - mysql-cell2:shared-db
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - nova-compute-cell2:cloud-credentials
+  - keystone:identity-credentials
+- - ntp:juju-info
+  - nova-compute-cell2:juju-info
+- - ntp:juju-info
+  - neutron-gateway:juju-info
+applications:
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      admin-password: openstack
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      innodb-buffer-pool-size: 256M
+      max-connections: 1000
+  mysql-cell2:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      innodb-buffer-pool-size: 256M
+      max-connections: 1000
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+      debug: true
+  nova-cell-controller-cell2:
+    charm: nova-cell-controller
+    series: bionic
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+      worker-multiplier: 0.25
+      debug: true
+      cell-name: "cell2"
+  nova-compute-cell2:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    constraints: mem=4G
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: cloud:bionic-stein
+      debug: true
+  ntp:
+    charm: cs:ntp-24
+    num_units: 0
+  rabbitmq-server-nova:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  rabbitmq-server-nova-cell2:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  rabbitmq-server-neutron:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1

src/tests/bundles/cosmic-rocky.yaml

@@ -108,6 +108,7 @@ applications:
       worker-multiplier: 0.25
       debug: true
   nova-cell-controller-cell2:
+    series: cosmic
     charm: nova-cell-controller
     num_units: 1
     options:
@@ -125,6 +126,7 @@ applications:
       migration-auth-type: ssh
       debug: true
   ntp:
+    series: bionic
     charm: cs:ntp-24
     num_units: 0
   rabbitmq-server-nova:

src/tests/bundles/disco-stein.yaml

@@ -0,0 +1,140 @@
+series: disco
+relations:
+- - nova-cloud-controller:nova-cell-api
+  - nova-cell-controller-cell2:nova-cell-compute
+- - nova-cloud-controller:shared-db-cell
+  - mysql-cell2:shared-db
+- - nova-cloud-controller:amqp-cell
+  - rabbitmq-server-nova-cell2:amqp
+- - nova-compute-cell2:amqp
+  - rabbitmq-server-nova-cell2:amqp
+- - neutron-gateway:amqp
+  - rabbitmq-server-neutron:amqp
+- - neutron-gateway:amqp-nova
+  - rabbitmq-server-nova:amqp
+- - keystone:shared-db
+  - mysql:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-openvswitch:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - neutron-api:shared-db
+  - mysql:shared-db
+- - neutron-api:amqp
+  - rabbitmq-server-neutron:amqp
+- - neutron-gateway:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:amqp
+  - rabbitmq-server-neutron:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-compute-cell2:image-service
+  - glance:image-service
+- - nova-cell-controller-cell2:cloud-compute
+  - nova-compute-cell2:cloud-compute
+- - nova-cloud-controller:amqp
+  - rabbitmq-server-nova:amqp
+- - nova-cell-controller-cell2:amqp
+  - rabbitmq-server-nova-cell2:amqp
+- - nova-cloud-controller:quantum-network-service
+  - neutron-gateway:quantum-network-service
+- - nova-compute-cell2:neutron-plugin
+  - neutron-openvswitch:neutron-plugin
+- - neutron-openvswitch:amqp
+  - rabbitmq-server-neutron:amqp
+- - nova-cloud-controller:shared-db
+  - mysql:shared-db
+- - nova-cell-controller-cell2:shared-db
+  - mysql-cell2:shared-db
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - nova-compute-cell2:cloud-credentials
+  - keystone:identity-credentials
+- - ntp:juju-info
+  - nova-compute-cell2:juju-info
+- - ntp:juju-info
+  - neutron-gateway:juju-info
+applications:
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      worker-multiplier: 0.25
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      admin-password: openstack
+      worker-multiplier: 0.25
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      innodb-buffer-pool-size: 256M
+      max-connections: 1000
+  mysql-cell2:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      innodb-buffer-pool-size: 256M
+      max-connections: 1000
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      worker-multiplier: 0.25
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      worker-multiplier: 0.25
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      worker-multiplier: 0.25
+      debug: true
+  nova-cell-controller-cell2:
+    series: disco
+    charm: nova-cell-controller
+    num_units: 1
+    options:
+      worker-multiplier: 0.25
+      debug: true
+      cell-name: "cell2"
+  nova-compute-cell2:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    constraints: mem=4G
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      debug: true
+  ntp:
+    series: bionic
+    charm: cs:ntp-24
+    num_units: 0
+  rabbitmq-server-nova:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  rabbitmq-server-nova-cell2:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  rabbitmq-server-neutron:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1

src/tests/tests.yaml

@@ -8,7 +8,10 @@ configure:
   - zaza.charm_tests.nova.setup.create_flavors
   - zaza.charm_tests.nova.setup.manage_ssh_key
 gate_bundles:
+  - cosmic-rocky
+  - bionic-stein
   - bionic-rocky
-  # - cosmic-rocky  # Pending LP https://bugs.launchpad.net/bugs/1804063
 smoke_bundles:
   - bionic-rocky
+dev_bundles:
+  - disco-stein