From 9074fcf4f103a7f455096a05c5330f2d706e0245 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 9 Apr 2019 07:39:33 +0200 Subject: [PATCH] Enable bionic/stein and disco/stein functional tests Change-Id: I6fb35d47ff78e8a8168efd51e41a4fd8bbe71444 --- src/tests/bundles/bionic-stein.yaml | 41 +++++++++++++++++++++++++++++ src/tests/bundles/cosmic-rocky.yaml | 4 +-- src/tests/bundles/disco-stein.yaml | 39 +++++++++++++++++++++++++++ src/tests/tests.yaml | 2 ++ 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 src/tests/bundles/bionic-stein.yaml create mode 100644 src/tests/bundles/disco-stein.yaml diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml new file mode 100644 index 0000000..256c904 --- /dev/null +++ b/src/tests/bundles/bionic-stein.yaml @@ -0,0 +1,41 @@ +series: bionic +relations: +- - mysql:shared-db + - keystone:shared-db +- - mysql:shared-db + - vault:shared-db +- - mysql:shared-db + - barbican:shared-db +- - keystone:identity-service + - barbican:identity-service +- - rabbitmq-server:amqp + - barbican:amqp +- - barbican-vault:secrets + - barbican:secrets +- - vault:secrets + - barbican-vault:secrets-storage +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: cloud:bionic-stein + barbican: + series: bionic + charm: cs:~openstack-charmers-next/barbican + num_units: 1 + options: + openstack-origin: cloud:bionic-stein + barbican-vault: + series: bionic + charm: ../../../barbican-vault + num_units: 0 + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/bundles/cosmic-rocky.yaml b/src/tests/bundles/cosmic-rocky.yaml index 41c38a4..c2c7f32 100644 --- a/src/tests/bundles/cosmic-rocky.yaml +++ b/src/tests/bundles/cosmic-rocky.yaml @@ -23,12 +23,12 @@ applications: num_units: 1 options: barbican: - series: bionic + series: cosmic charm: cs:~openstack-charmers-next/barbican num_units: 1 options: barbican-vault: - series: bionic + series: cosmic charm: ../../../barbican-vault num_units: 0 rabbitmq-server: diff --git a/src/tests/bundles/disco-stein.yaml b/src/tests/bundles/disco-stein.yaml new file mode 100644 index 0000000..75f7607 --- /dev/null +++ b/src/tests/bundles/disco-stein.yaml @@ -0,0 +1,39 @@ +series: disco +relations: +- - mysql:shared-db + - keystone:shared-db +- - mysql:shared-db + - vault:shared-db +- - mysql:shared-db + - barbican:shared-db +- - keystone:identity-service + - barbican:identity-service +- - rabbitmq-server:amqp + - barbican:amqp +- - barbican-vault:secrets + - barbican:secrets +- - vault:secrets + - barbican-vault:secrets-storage +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + barbican: + series: disco + charm: cs:~openstack-charmers-next/barbican + num_units: 1 + options: + barbican-vault: + series: disco + charm: ../../../barbican-vault + num_units: 0 + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index f1a74b0..aad2c72 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -3,7 +3,9 @@ smoke_bundles: - bionic-rocky gate_bundles: - bionic-rocky +- bionic-stein - cosmic-rocky +- disco-stein target_deploy_status: barbican-vault: workload-status: waiting