openstack/sunbeam-charms
Code Issues Proposed changes

Merge "Bump juju channel to 3.4" into main

Browse Source
This commit is contained in:
Zuul 2024-02-22 11:04:00 +00:00 committed by Gerrit Code Review
commit fb5e1bcf9f
9 changed files with 72 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/caas/smoke.yaml.j2
View File

@ -4,6 +4,7 @@ applications:
traefik: traefik:
charm: ch:traefik-k8s charm: ch:traefik-k8s
channel: 1.0/candidate channel: 1.0/candidate
base: ubuntu@20.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -11,23 +12,27 @@ applications:
mysql: mysql:
charm: ch:mysql-k8s charm: ch:mysql-k8s
channel: 8.0/stable channel: 8.0/stable
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
constraints: cpu-power=1000 mem=1G constraints: cpu-power=1000 mem=1G
vault: vault:
charm: ch:vault-k8s charm: ch:vault-k8s
channel: latest/edge channel: latest/edge
base: ubuntu@22.04
scale: 1 scale: 1
trust: false trust: false
tls-operator: tls-operator:
charm: self-signed-certificates charm: self-signed-certificates
channel: latest/beta channel: latest/beta
base: ubuntu@22.04
scale: 1 scale: 1
options: options:
ca-common-name: internal-ca ca-common-name: internal-ca
rabbitmq: rabbitmq:
charm: ch:rabbitmq-k8s charm: ch:rabbitmq-k8s
channel: 3.12/edge channel: 3.12/edge
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -39,6 +44,7 @@ applications:
charm: ch:ovn-central-k8s charm: ch:ovn-central-k8s
channel: 23.03/edge channel: 23.03/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -52,6 +58,7 @@ applications:
charm: ch:keystone-k8s charm: ch:keystone-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -68,6 +75,7 @@ applications:
charm: ch:glance-k8s charm: ch:glance-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
storage: storage:
@ -81,6 +89,7 @@ applications:
charm: ch:heat-k8s charm: ch:heat-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -93,6 +102,7 @@ applications:
charm: ch:octavia-k8s charm: ch:octavia-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -106,6 +116,7 @@ applications:
charm: ch:barbican-k8s charm: ch:barbican-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: false trust: false
resources: resources:
@ -118,6 +129,7 @@ applications:
charm: ch:magnum-k8s charm: ch:magnum-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: false trust: false
resources: resources:

9
tests/ceph/smoke.yaml.j2
View File

@ -4,6 +4,7 @@ applications:
traefik: traefik:
charm: ch:traefik-k8s charm: ch:traefik-k8s
channel: 1.0/candidate channel: 1.0/candidate
base: ubuntu@20.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -11,12 +12,14 @@ applications:
mysql: mysql:
charm: ch:mysql-k8s charm: ch:mysql-k8s
channel: 8.0/stable channel: 8.0/stable
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
constraints: cpu-power=1000 mem=1G constraints: cpu-power=1000 mem=1G
rabbitmq: rabbitmq:
charm: ch:rabbitmq-k8s charm: ch:rabbitmq-k8s
channel: 3.12/edge channel: 3.12/edge
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -28,6 +31,7 @@ applications:
charm: ch:keystone-k8s charm: ch:keystone-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -44,6 +48,7 @@ applications:
charm: ch:cinder-k8s charm: ch:cinder-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -56,6 +61,7 @@ applications:
charm: ch:cinder-ceph-k8s charm: ch:cinder-ceph-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -67,6 +73,7 @@ applications:
charm: ch:gnocchi-k8s charm: ch:gnocchi-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -79,6 +86,7 @@ applications:
charm: ch:ceilometer-k8s charm: ch:ceilometer-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -91,6 +99,7 @@ applications:
charm: ch:aodh-k8s charm: ch:aodh-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:

31
tests/core/smoke.yaml.j2
View File

@ -4,6 +4,7 @@ applications:
traefik: traefik:
charm: ch:traefik-k8s charm: ch:traefik-k8s
channel: 1.0/candidate channel: 1.0/candidate
base: ubuntu@20.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -11,18 +12,21 @@ applications:
mysql: mysql:
charm: ch:mysql-k8s charm: ch:mysql-k8s
channel: 8.0/stable channel: 8.0/stable
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
constraints: cpu-power=1000 mem=1G constraints: cpu-power=1000 mem=1G
tls-operator: tls-operator:
charm: self-signed-certificates charm: self-signed-certificates
channel: latest/beta channel: latest/beta
base: ubuntu@22.04
scale: 1 scale: 1
options: options:
ca-common-name: internal-ca ca-common-name: internal-ca
rabbitmq: rabbitmq:
charm: ch:rabbitmq-k8s charm: ch:rabbitmq-k8s
channel: 3.12/edge channel: 3.12/edge
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -34,6 +38,7 @@ applications:
charm: ch:ovn-central-k8s charm: ch:ovn-central-k8s
channel: 23.03/edge channel: 23.03/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -47,6 +52,7 @@ applications:
charm: ch:ovn-relay-k8s charm: ch:ovn-relay-k8s
channel: 23.03/edge channel: 23.03/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -58,6 +64,7 @@ applications:
charm: ch:keystone-k8s charm: ch:keystone-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -74,6 +81,7 @@ applications:
charm: ch:glance-k8s charm: ch:glance-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
storage: storage:
@ -87,6 +95,7 @@ applications:
charm: ch:nova-k8s charm: ch:nova-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -100,6 +109,7 @@ applications:
charm: ch:placement-k8s charm: ch:placement-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
resources: resources:
@ -111,23 +121,13 @@ applications:
charm: ch:neutron-k8s charm: ch:neutron-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
debug: true debug: true
resources: resources:
neutron-server-image: ghcr.io/canonical/neutron-server:2023.2 neutron-server-image: ghcr.io/canonical/neutron-server:2023.2
horizon:
{% if horizon_k8s is defined and horizon_k8s is sameas true -%}
charm: ../../../horizon-k8s.charm
{% else -%}
charm: ch:horizon-k8s
channel: 2023.2/edge
{% endif -%}
scale: 1
trust: true
resources:
horizon-image: ghcr.io/canonical/horizon:2023.2
relations: relations:
- - tls-operator:certificates - - tls-operator:certificates
@ -192,12 +192,3 @@ relations:
- ovn-central:ovsdb-cms - ovn-central:ovsdb-cms
- - keystone:send-ca-cert - - keystone:send-ca-cert
- neutron:receive-ca-cert - neutron:receive-ca-cert
- - mysql:database
- horizon:database
- - keystone:identity-credentials
- horizon:identity-credentials
- - traefik:ingress
- horizon:ingress-public
- - keystone:send-ca-cert
- horizon:receive-ca-cert

3
tests/core/tests.yaml
View File

@ -67,6 +67,3 @@ target_deploy_status:
neutron: neutron:
workload-status: active workload-status: active
workload-status-message-regex: '^$' workload-status-message-regex: '^$'
horizon:
workload-status: active
workload-status-message-regex: '^$'

30
tests/misc/smoke.yaml.j2
View File

@ -4,6 +4,7 @@ applications:
traefik: traefik:
charm: ch:traefik-k8s charm: ch:traefik-k8s
channel: 1.0/candidate channel: 1.0/candidate
base: ubuntu@20.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -11,16 +12,19 @@ applications:
mysql: mysql:
charm: ch:mysql-k8s charm: ch:mysql-k8s
channel: 8.0/stable channel: 8.0/stable
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
constraints: cpu-power=1000 mem=1G constraints: cpu-power=1000 mem=1G
ldap-server: ldap-server:
charm: ch:ldap-test-fixture-k8s charm: ch:ldap-test-fixture-k8s
channel: edge channel: edge
base: ubuntu@22.04
scale: 1 scale: 1
rabbitmq: rabbitmq:
charm: ch:rabbitmq-k8s charm: ch:rabbitmq-k8s
channel: 3.12/edge channel: 3.12/edge
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -32,6 +36,7 @@ applications:
charm: ch:keystone-k8s charm: ch:keystone-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -48,6 +53,7 @@ applications:
charm: ch:designate-bind-k8s charm: ch:designate-bind-k8s
channel: 9/edge channel: 9/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: false trust: false
resources: resources:
@ -59,6 +65,7 @@ applications:
charm: ch:designate-k8s charm: ch:designate-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
trust: false trust: false
resources: resources:
@ -70,6 +77,7 @@ applications:
charm: ch:keystone-ldap-k8s charm: ch:keystone-ldap-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
openstack-exporter: openstack-exporter:
{% if openstack_exporter_k8s is defined and openstack_exporter_k8s is sameas true -%} {% if openstack_exporter_k8s is defined and openstack_exporter_k8s is sameas true -%}
@ -78,9 +86,22 @@ applications:
charm: ch:openstack-exporter-k8s charm: ch:openstack-exporter-k8s
channel: 2023.2/edge channel: 2023.2/edge
{% endif -%} {% endif -%}
base: ubuntu@22.04
scale: 1 scale: 1
resources: resources:
openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.6.0-7533071 openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.6.0-7533071
horizon:
{% if horizon_k8s is defined and horizon_k8s is sameas true -%}
charm: ../../../horizon-k8s.charm
{% else -%}
charm: ch:horizon-k8s
channel: 2023.2/edge
{% endif -%}
base: ubuntu@22.04
scale: 1
trust: true
resources:
horizon-image: ghcr.io/canonical/horizon:2023.2
relations: relations:
- - mysql:database - - mysql:database
@ -106,3 +127,12 @@ relations:
- - keystone:identity-ops - - keystone:identity-ops
- openstack-exporter:identity-ops - openstack-exporter:identity-ops
- - mysql:database
- horizon:database
- - keystone:identity-credentials
- horizon:identity-credentials
- - traefik:ingress
- horizon:ingress-public
- - keystone:send-ca-cert
- horizon:receive-ca-cert

3
tests/misc/tests.yaml
View File

@ -50,3 +50,6 @@ target_deploy_status:
openstack-exporter: openstack-exporter:
workload-status: active workload-status: active
workload-status-message-regex: '^$' workload-status-message-regex: '^$'
horizon:
workload-status: active
workload-status-message-regex: '^$'

3
tox.ini
View File

@ -76,7 +76,7 @@ commands =
[testenv:func-noop] [testenv:func-noop]
basepython = python3 basepython = python3
deps = deps =
git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza 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://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
git+https://opendev.org/openstack/tempest.git#egg=tempest git+https://opendev.org/openstack/tempest.git#egg=tempest
commands = commands =
@ -86,6 +86,7 @@ commands =
basepython = python3 basepython = python3
deps = {[testenv:func-noop]deps} deps = {[testenv:func-noop]deps}
passenv = passenv =
HOME
PYTHONPATH PYTHONPATH
setenv = setenv =
TEST_MODEL_SETTINGS = automatically-retry-hooks=true TEST_MODEL_SETTINGS = automatically-retry-hooks=true

8
zuul.d/jobs.yaml
View File

@ -321,8 +321,6 @@
soft: true soft: true
- name: charm-build-ovn-relay-k8s - name: charm-build-ovn-relay-k8s
soft: true soft: true
- name: charm-build-horizon-k8s
soft: true
files: files:
- ops-sunbeam/ops_sunbeam/* - ops-sunbeam/ops_sunbeam/*
- charms/keystone-k8s/* - charms/keystone-k8s/*
@ -332,7 +330,6 @@
- charms/placement-k8s/* - charms/placement-k8s/*
- charms/ovn-central-k8s/* - charms/ovn-central-k8s/*
- charms/ovn-relay-k8s/* - charms/ovn-relay-k8s/*
- charms/horizon-k8s/*
- rebuild - rebuild
vars: vars:
# Artifacts will be downloaded from below charm jobs # Artifacts will be downloaded from below charm jobs
@ -344,7 +341,6 @@
- charm-build-neutron-k8s - charm-build-neutron-k8s
- charm-build-ovn-central-k8s - charm-build-ovn-central-k8s
- charm-build-ovn-relay-k8s - charm-build-ovn-relay-k8s
- charm-build-horizon-k8s
# test_dir relative to project src dir # test_dir relative to project src dir
test_dir: tests/core test_dir: tests/core
- job: - job:
@ -444,12 +440,15 @@
soft: true soft: true
- name: charm-build-openstack-exporter-k8s - name: charm-build-openstack-exporter-k8s
soft: true soft: true
- name: charm-build-horizon-k8s
soft: true
files: files:
- ops-sunbeam/ops_sunbeam/* - ops-sunbeam/ops_sunbeam/*
- charms/designate-k8s/* - charms/designate-k8s/*
- charms/designate-bind-k8s/* - charms/designate-bind-k8s/*
- charms/keystone-ldap-k8s/* - charms/keystone-ldap-k8s/*
- charms/openstack-exporter-k8s/* - charms/openstack-exporter-k8s/*
- charms/horizon-k8s/*
- rebuild - rebuild
vars: vars:
charm_jobs: charm_jobs:
@ -458,6 +457,7 @@
- charm-build-keystone-ldap-k8s - charm-build-keystone-ldap-k8s
- charm-build-openstack-exporter-k8s - charm-build-openstack-exporter-k8s
- charm-build-keystone-k8s - charm-build-keystone-k8s
- charm-build-horizon-k8s
test_dir: tests/misc test_dir: tests/misc
- job: - job:
name: func-test-machine name: func-test-machine

2
zuul.d/zuul.yaml
View File

@ -17,7 +17,7 @@
- func-test-machine: - func-test-machine:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
vars: vars:
juju_channel: 3.2/stable juju_channel: 3.4/stable
juju_classic_mode: false juju_classic_mode: false
env_type: k8s env_type: k8s
microk8s_channel: 1.28-strict/stable microk8s_channel: 1.28-strict/stable