Use tls-certificates-interface library
Use tls-certificates-interface library from https://charmhub.io/tls-certificates-interface/libraries/tls_certificates Fix py3 failures due to cryptography package clashes from zaza. Move zaza dependcies from test-requirements to tox Depends-On: https://review.opendev.org/c/openstack/charm-ops-sunbeam/+/865410 Change-Id: Ia8769bbccfd0d9b97bd2334e1f4c2e40387d2b20changes/66/865666/13
parent
c3c60ddc1f
commit
f1700babd8
|
@ -2,6 +2,13 @@
|
|||
templates:
|
||||
- openstack-python3-charm-yoga-jobs
|
||||
- openstack-cover-jobs
|
||||
- microk8s-func-test
|
||||
# - microk8s-func-test
|
||||
check:
|
||||
jobs:
|
||||
- charmbuild:
|
||||
nodeset: ubuntu-focal
|
||||
- zaza-smoke-test:
|
||||
nodeset: ubuntu-focal
|
||||
voting: false
|
||||
vars:
|
||||
charm_build_name: ovn-central-k8s
|
||||
|
|
|
@ -2,3 +2,4 @@
|
|||
|
||||
echo "INFO: Fetching libs from charmhub."
|
||||
charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
|
||||
charmcraft fetch-lib charms.tls_certificates_interface.v1.tls_certificates
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6,9 +6,8 @@
|
|||
|
||||
cryptography
|
||||
jinja2
|
||||
jsonschema
|
||||
lightkube
|
||||
lightkube-models
|
||||
ops
|
||||
git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam
|
||||
|
||||
git+https://opendev.org/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates
|
||||
|
|
|
@ -6,9 +6,5 @@
|
|||
|
||||
coverage
|
||||
mock
|
||||
flake8
|
||||
stestr
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest
|
||||
ops
|
||||
|
|
|
@ -64,12 +64,13 @@ applications:
|
|||
ovn-sb-db-server-image: kolla/ubuntu-binary-ovn-sb-db-server:yoga
|
||||
ovn-nb-db-server-image: kolla/ubuntu-binary-ovn-nb-db-server:yoga
|
||||
ovn-northd-image: kolla/ubuntu-binary-ovn-northd:yoga
|
||||
vault:
|
||||
charm: ch:icey-vault-k8s
|
||||
channel: stable
|
||||
tls-operator:
|
||||
charm: tls-certificates-operator
|
||||
channel: edge
|
||||
scale: 1
|
||||
resources:
|
||||
vault-image: vault
|
||||
options:
|
||||
generate-self-signed-certificates: true
|
||||
ca-common-name: internal-ca
|
||||
|
||||
relations:
|
||||
- - mysql:database
|
||||
|
@ -124,10 +125,10 @@ relations:
|
|||
- neutron:ingress-internal
|
||||
- - traefik-public:ingress
|
||||
- neutron:ingress-public
|
||||
- - vault:insecure-certificates
|
||||
- - tls-operator:certificates
|
||||
- neutron:certificates
|
||||
- - neutron:ovsdb-cms
|
||||
- ovn-central:ovsdb-cms
|
||||
|
||||
- - vault:insecure-certificates
|
||||
- - tls-operator:certificates
|
||||
- ovn-central:certificates
|
||||
|
|
|
@ -61,10 +61,10 @@ target_deploy_status:
|
|||
workload-status-message-regex: '^$'
|
||||
mysql:
|
||||
workload-status: active
|
||||
workload-status-message-regex: '^$'
|
||||
workload-status-message-regex: '^Unit is ready.*$'
|
||||
placement:
|
||||
workload-status: active
|
||||
workload-status-message-regex: '^$'
|
||||
vault:
|
||||
tls-operator:
|
||||
workload-status: active
|
||||
workload-status-message-regex: '^$'
|
||||
|
|
8
tox.ini
8
tox.ini
|
@ -115,11 +115,16 @@ commands =
|
|||
|
||||
[testenv:func-noop]
|
||||
basepython = python3
|
||||
deps =
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
|
||||
git+https://opendev.org/openstack/tempest.git#egg=tempest
|
||||
commands =
|
||||
functest-run-suite --help
|
||||
|
||||
[testenv:func]
|
||||
basepython = python3
|
||||
deps = {[testenv:func-noop]deps}
|
||||
commands =
|
||||
functest-run-suite --keep-model
|
||||
|
||||
|
@ -128,16 +133,19 @@ basepython = python3
|
|||
setenv =
|
||||
TEST_MODEL_SETTINGS = automatically-retry-hooks=true
|
||||
TEST_MAX_RESOLVE_COUNT = 5
|
||||
deps = {[testenv:func-noop]deps}
|
||||
commands =
|
||||
functest-run-suite --keep-model --smoke
|
||||
|
||||
[testenv:func-dev]
|
||||
basepython = python3
|
||||
deps = {[testenv:func-noop]deps}
|
||||
commands =
|
||||
functest-run-suite --keep-model --dev
|
||||
|
||||
[testenv:func-target]
|
||||
basepython = python3
|
||||
deps = {[testenv:func-noop]deps}
|
||||
commands =
|
||||
functest-run-suite --keep-model --bundle {posargs}
|
||||
|
||||
|
|
Loading…
Reference in New Issue