From 3e705e375baf10dc99330f1cc70fb8e5bffafa38 Mon Sep 17 00:00:00 2001 From: Camille Rodriguez Date: Tue, 24 Mar 2020 15:59:19 -0500 Subject: [PATCH] add func tests --- src/tests/bundles/bionic-queens.yaml | 15 +--------- src/tests/bundles/bionic-rocky.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-stein.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-train.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/bionic-ussuri.yaml | 41 ++++++++++++++++++++++++++++ src/tests/bundles/focal-ussuri.yaml | 41 ++++++++++++++++++++++++++++ src/tests/tests.yaml | 10 +++++-- 7 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 src/tests/bundles/bionic-rocky.yaml create mode 100644 src/tests/bundles/bionic-stein.yaml create mode 100644 src/tests/bundles/bionic-train.yaml create mode 100644 src/tests/bundles/bionic-ussuri.yaml create mode 100644 src/tests/bundles/focal-ussuri.yaml diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 0c22ec7..3588252 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -6,16 +6,11 @@ machines: constraints: mem=3072M '1': '2': - '3': relations: - - keystone:shared-db - mysql:shared-db - - keystone - keystone-kerberos -- - openstack-dashboard:identity-service - - keystone:identity-service -- - openstack-dashboard:shared-db - - mysql:shared-db applications: mysql: charm: cs:~openstack-charmers-next/percona-cluster @@ -30,11 +25,6 @@ applications: token-expiration: 60 to: - '1' - openstack-dashboard: - charm: cs:~openstack-charmers-next/openstack-dashboard - num_units: 1 - to: - - '2' keystone-kerberos: charm: ../../../keystone-kerberos options: @@ -48,7 +38,4 @@ applications: charm: cs:~openstack-charmers-next/kerberos-test-fixture num_units: 1 to: - - '3' - - - + - '2' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-rocky.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + keystone-kerberos: + charm: ../../../keystone-kerberos + options: + kerberos-realm: 'TESTUBUNTU.COM' + kerberos-server: 'kerberos.testubuntu.com' + kerberos-domain: 'k8s' + resource: + keystone_keytab: keystone.keytab + + kerberos-server: + charm: cs:~openstack-charmers-next/kerberos-test-fixture + num_units: 1 + to: + - '2' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-stein.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + keystone-kerberos: + charm: ../../../keystone-kerberos + options: + kerberos-realm: 'TESTUBUNTU.COM' + kerberos-server: 'kerberos.testubuntu.com' + kerberos-domain: 'k8s' + resource: + keystone_keytab: keystone.keytab + + kerberos-server: + charm: cs:~openstack-charmers-next/kerberos-test-fixture + num_units: 1 + to: + - '2' diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-train.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + keystone-kerberos: + charm: ../../../keystone-kerberos + options: + kerberos-realm: 'TESTUBUNTU.COM' + kerberos-server: 'kerberos.testubuntu.com' + kerberos-domain: 'k8s' + resource: + keystone_keytab: keystone.keytab + + kerberos-server: + charm: cs:~openstack-charmers-next/kerberos-test-fixture + num_units: 1 + to: + - '2' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml new file mode 100644 index 0000000..3588252 --- /dev/null +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -0,0 +1,41 @@ +series: bionic +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + keystone-kerberos: + charm: ../../../keystone-kerberos + options: + kerberos-realm: 'TESTUBUNTU.COM' + kerberos-server: 'kerberos.testubuntu.com' + kerberos-domain: 'k8s' + resource: + keystone_keytab: keystone.keytab + + kerberos-server: + charm: cs:~openstack-charmers-next/kerberos-test-fixture + num_units: 1 + to: + - '2' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml new file mode 100644 index 0000000..d8507bd --- /dev/null +++ b/src/tests/bundles/focal-ussuri.yaml @@ -0,0 +1,41 @@ +series: focal +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + '2': +relations: +- - keystone:shared-db + - mysql:shared-db +- - keystone + - keystone-kerberos +applications: + mysql: + charm: cs:~openstack-charmers-next/percona-cluster + num_units: 1 + to: + - '0' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + token-provider: 'fernet' + token-expiration: 60 + to: + - '1' + keystone-kerberos: + charm: ../../../keystone-kerberos + options: + kerberos-realm: 'TESTUBUNTU.COM' + kerberos-server: 'kerberos.testubuntu.com' + kerberos-domain: 'k8s' + resource: + keystone_keytab: keystone.keytab + + kerberos-server: + charm: cs:~openstack-charmers-next/kerberos-test-fixture + num_units: 1 + to: + - '2' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 405a9ea..e4fde64 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,8 +1,14 @@ charm_name: keystone-kerberos smoke_bundles: -- bionic-queens + - bionic-train gate_bundles: -- bionic-queens + - bionic-queens + - bionic-rocky + - bionic-stein + - bionic-train +dev_bundles: + - bionic-ussuri + - focal-ussuri configure: - zaza.openstack.charm_tests.kerberos.setup.run_all_tests tests: