diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 0000000..b6d2452 --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,7 @@ +# NOTES(lourot): +# * We don't install charmcraft via pip anymore because it anyway spins up a +# container and scp the system's charmcraft snap inside it. So the charmcraft +# snap is necessary on the system anyway. +# * `tox -e build` successfully validated with charmcraft 1.2.1 + +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..4968216 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,25 @@ +type: charm + +parts: + charm: + build-packages: + - tox + - git + - python3-dev + override-build: | + apt-get install ca-certificates -y + tox -e build-reactive + override-stage: | + echo "Copying charm to staging area: $CHARMCRAFT_STAGE" + NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds) + cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/ + override-prime: | + # For some reason, the normal priming chokes on the fact that there's a + # hooks directory. + cp -r $CHARMCRAFT_STAGE/* . + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index a931fe2..b7a2801 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,12 +1,10 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: barbican-vault + build_type: charmcraft diff --git a/rename.sh b/rename.sh new file mode 100755 index 0000000..d0c35c9 --- /dev/null +++ b/rename.sh @@ -0,0 +1,13 @@ +#!/bin/bash +charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') +echo "renaming ${charm}_*.charm to ${charm}.charm" +echo -n "pwd: " +pwd +ls -al +echo "Removing bad downloaded charm maybe?" +if [[ -e "${charm}.charm" ]]; +then + rm "${charm}.charm" +fi +echo "Renaming charm here." +mv ${charm}_*.charm ${charm}.charm diff --git a/src/metadata.yaml b/src/metadata.yaml index 771bfbd..f14b9f9 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -5,10 +5,7 @@ description: Vault backend for OpenStack Barbican tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true provides: diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..9c7afb7 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -4,6 +4,9 @@ # https://github.com/openstack-charmers/release-tools # +# Need tox to be available from tox... inception yes, but its a workaround for now +tox + # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 1c9df3f..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,41 +0,0 @@ -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-rocky - barbican: - series: bionic - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: cloud:bionic-rocky - 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/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 1bff192..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,41 +0,0 @@ -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: 3 - 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/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 0023391..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,41 +0,0 @@ -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-train - barbican: - series: bionic - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: cloud:bionic-train - 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/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index def4574..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,39 +0,0 @@ -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-ussuri - barbican: - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: cloud:bionic-ussuri - barbican-vault: - 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/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index b9a1604..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,104 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - barbican-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - - barbican-vault: - charm: ../../../barbican-vault - num_units: 0 - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '7' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '8' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index d2e58d0..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,104 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - barbican-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - - barbican-vault: - charm: ../../../barbican-vault - num_units: 0 - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '7' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '8' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 9c26274..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,104 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - barbican-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - - barbican-vault: - charm: ../../../barbican-vault - num_units: 0 - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '7' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '8' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index a32f8db..853c178 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-xena +local_overlay_enabled: False + series: focal comment: @@ -22,14 +24,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -37,17 +42,19 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge barbican: - charm: cs:~openstack-charmers-next/barbican + charm: ch:barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -55,24 +62,27 @@ applications: - '4' - '5' - '6' + channel: latest/edge barbican-vault: - charm: ../../../barbican-vault + charm: ../../../barbican-vault.charm num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '7' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 to: - '8' + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index f85b90b..81b10b0 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin cloud:focal-yoga +local_overlay_enabled: False + series: focal comment: @@ -22,14 +24,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -37,17 +42,19 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge barbican: - charm: cs:~openstack-charmers-next/barbican + charm: ch:barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -55,24 +62,27 @@ applications: - '4' - '5' - '6' + channel: latest/edge barbican-vault: - charm: ../../../barbican-vault + charm: ../../../barbican-vault.charm num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '7' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 to: - '8' + channel: latest/edge relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 89d1399..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,104 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - barbican-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' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - charm: cs:~openstack-charmers-next/barbican - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '4' - - '5' - - '6' - - barbican-vault: - charm: ../../../barbican-vault - num_units: 0 - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '7' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '8' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' - - - - 'barbican-vault:secrets' - - 'barbican:secrets' - - - - 'vault:secrets' - - 'barbican-vault:secrets-storage' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 0e7c28f..92bed68 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: impish comment: @@ -22,14 +24,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -37,17 +42,19 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge barbican: - charm: cs:~openstack-charmers-next/barbican + charm: ch:barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -55,24 +62,27 @@ applications: - '4' - '5' - '6' + channel: latest/edge barbican-vault: - charm: ../../../barbican-vault + charm: ../../../barbican-vault.charm num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '7' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 to: - '8' + channel: latest/edge relations: diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index cbf2482..72dcc57 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -1,6 +1,8 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: jammy comment: @@ -22,14 +24,17 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -37,17 +42,19 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge barbican: - charm: cs:~openstack-charmers-next/barbican + charm: ch:barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -55,24 +62,27 @@ applications: - '4' - '5' - '6' + channel: latest/edge barbican-vault: - charm: ../../../barbican-vault + charm: ../../../barbican-vault.charm num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '7' + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 to: - '8' + channel: latest/edge relations: diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 index a9e5059..e24968f 100644 --- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 +++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 @@ -3,7 +3,8 @@ applications: options: vip: '{{ TEST_VIP01 }}' barbican-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: latest/edge relations: - - barbican:ha - barbican-hacluster:ha diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 1e6dfa2..a3742f3 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,33 +1,24 @@ charm_name: barbican-vault smoke_bundles: -- focal-ussuri +- focal-yoga gate_bundles: -- bionic-stein -- bionic-ussuri -- focal-ussuri -- focal-victoria -- focal-wallaby - focal-xena -- hirsute-wallaby - impish-xena dev_bundles: -- bionic-rocky -- bionic-train - focal-yoga - jammy-yoga target_deploy_status: barbican-vault: workload-status: waiting - workload-status-message: "'secrets-storage' incomplete" + workload-status-message-prefix: "'secrets-storage' incomplete" vault: workload-status: blocked - workload-status-message: Vault needs to be initialized + workload-status-message-prefix: Vault needs to be initialized configure: - zaza.openstack.charm_tests.vault.setup.basic_setup tests: - zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga diff --git a/test-requirements.txt b/test-requirements.txt index 208032f..a11a7d0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive +# Newer mock seems to have some syntax which is newer than python3.5 (e.g. +# f'{something}' +mock>=1.2,<4.0.0; python_version < '3.6' +mock>=1.2; python_version >= '3.6' + nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack @@ -46,3 +51,4 @@ pbr==5.6.0 # vault cryptography<3.4 # vault, keystone-saml-mellon lxml # keystone-saml-mellon hvac # vault, barbican-vault +psutil # cinder-lvm diff --git a/tox.ini b/tox.ini index faf6092..2d60b8a 100644 --- a/tox.ini +++ b/tox.ini @@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir} passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = {toxinidir}/pip.sh install {opts} {packages} +allowlist_externals = + charmcraft + bash + tox + rename.sh deps = -r{toxinidir}/requirements.txt [testenv:build] basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:build-reactive] +basepython = python3 commands = charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} @@ -86,6 +99,18 @@ deps = flake8==3.9.2 charm-tools==2.8.3 commands = flake8 {posargs} src unit_tests +[testenv:func-target] +# Hack to get functional tests working in the charmcraft +# world. We should fix this. +basepython = python3 +passenv = HOME TERM CS_* OS_* TEST_* +deps = -r{toxinidir}/src/test-requirements.txt +changedir = {toxinidir}/src +commands = + bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi" + tox --version + tox -e func-target {posargs} + [testenv:cover] # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini