diff --git a/.gitreview b/.gitreview index e250aca..aec17c3 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/charm-keystone-kerberos.git diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..fd20909 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,4 @@ +- project: + templates: + - openstack-python3-charm-jobs + - openstack-cover-jobs diff --git a/requirements.txt b/requirements.txt index 56e8b71..5f2fff3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,6 @@ # # Build requirements charm-tools>=2.4.4 -simplejson \ No newline at end of file +# importlib-resources 1.1.0 removed Python 3.5 support +importlib-resources<1.1.0 +simplejson diff --git a/src/metadata.yaml b/src/metadata.yaml index 05a32b3..433d380 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -12,6 +12,7 @@ tags: series: - bionic - focal + - groovy subordinate: true provides: keystone-fid-service-provider: diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index fe77e17..e0cdd16 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -1,3 +1,6 @@ +variables: + openstack-origin: &openstack-origin distro + series: focal comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -5,27 +8,42 @@ machines: '0': constraints: mem=3072M '1': + constraints: mem=3072M '2': + constraints: mem=3072M '3': + '4': + '5': relations: - - keystone:shared-db - - mysql:shared-db + - keystone-mysql-router:shared-db +- - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router - - keystone - keystone-kerberos applications: - mysql: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 + keystone-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 token-provider: 'fernet' token-expiration: 60 to: - - '1' + - '3' keystone-kerberos: charm: ../../../keystone-kerberos options: @@ -39,9 +57,9 @@ applications: charm: cs:~openstack-charmers-next/kerberos-test-fixture num_units: 1 to: - - '2' + - '4' ubuntu-test-host: charm: cs:ubuntu num_units: 1 to: - - '3' + - '5' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml new file mode 100644 index 0000000..ac0300e --- /dev/null +++ b/src/tests/bundles/focal-victoria.yaml @@ -0,0 +1,65 @@ +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': +relations: +- - keystone:shared-db + - keystone-mysql-router:shared-db +- - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone + - keystone-kerberos +applications: + keystone-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 + token-provider: 'fernet' + token-expiration: 60 + to: + - '3' + 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: + - '4' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '5' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml new file mode 100644 index 0000000..6ab7f49 --- /dev/null +++ b/src/tests/bundles/groovy-victoria.yaml @@ -0,0 +1,65 @@ +variables: + openstack-origin: &openstack-origin distro + +series: groovy +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': +relations: +- - keystone:shared-db + - keystone-mysql-router:shared-db +- - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router +- - keystone + - keystone-kerberos +applications: + keystone-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 + token-provider: 'fernet' + token-expiration: 60 + to: + - '3' + 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: + - '4' + ubuntu-test-host: + charm: cs:ubuntu + num_units: 1 + to: + - '5' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 57a0760..844c6d4 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -6,16 +6,18 @@ gate_bundles: - bionic-rocky - bionic-stein - bionic-train -dev_bundles: - bionic-ussuri - focal-ussuri +dev_bundles: + - focal-victoria + - groovy-victoria configure: - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps tests: - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest tests_options: force_deploy: - - focal-ussuri + - groovy-victoria target_deploy_status: keystone-kerberos: workload-status: blocked diff --git a/src/tox.ini b/src/tox.ini index 9c27bbf..07a7adc 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -47,4 +47,4 @@ commands = functest-run-suite --keep-model --bundle {posargs} [testenv:venv] -commands = {posargs} \ No newline at end of file +commands = {posargs} diff --git a/test-requirements.txt b/test-requirements.txt index 14b380e..0ab97f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,7 @@ -# This file is managed centrally. If you find the need to modify this as a -# one-off, please don't. Intead, consult #openstack-charms and ask about -# requirements management in charms via bot-control. Thank you. +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of *requirements.txt files for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools # # Lint and unit test requirements flake8>=2.2.4,<=2.4.1 @@ -11,3 +12,12 @@ mock>=1.2 nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +# +# Revisit for removal / mock improvement: +netifaces # vault +psycopg2-binary # vault +tenacity # vault +pbr # vault +cryptography # vault, keystone-saml-mellon +lxml # keystone-saml-mellon +hvac # vault, barbican-vault diff --git a/tox.ini b/tox.ini index f8f5092..f8dd599 100644 --- a/tox.ini +++ b/tox.ini @@ -50,6 +50,11 @@ basepython = python3.7 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py38] +basepython = python3.8 +deps = -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + [testenv:pep8] basepython = python3 deps = -r{toxinidir}/test-requirements.txt @@ -89,4 +94,4 @@ commands = {posargs} [flake8] # E402 ignore necessary for path append before sys module import in actions -ignore = E402,W504 \ No newline at end of file +ignore = E402,W503