From 57070337b476374978431fcdbbad71f23a653d80 Mon Sep 17 00:00:00 2001 From: Hemanth Nakkina Date: Wed, 21 Feb 2024 17:42:58 +0530 Subject: [PATCH] Bump juju channel to 3.4 Move testing to juju 3.4 Set base to ubuntu@22.04 in all test bundles with traefik charm to ubuntu@20.04. tox can be modified to include default-series=;default-base=ubuntu@22.04 in TEST_MODEL_SETTINGS but that is not working for lxd based cloud. Update tox to use zaza from main instead of libjuju-3.1 for func tests. Func-tests for core are failing due to heavy load. Moved horizon to tests/misc Change-Id: I6c025e1350aad7ead922cf5feef19c67c308dbbd --- tests/caas/smoke.yaml.j2 | 12 ++++++++++++ tests/ceph/smoke.yaml.j2 | 9 +++++++++ tests/core/smoke.yaml.j2 | 31 +++++++++++-------------------- tests/core/tests.yaml | 3 --- tests/misc/smoke.yaml.j2 | 30 ++++++++++++++++++++++++++++++ tests/misc/tests.yaml | 3 +++ tox.ini | 3 ++- zuul.d/jobs.yaml | 8 ++++---- zuul.d/zuul.yaml | 2 +- 9 files changed, 72 insertions(+), 29 deletions(-) diff --git a/tests/caas/smoke.yaml.j2 b/tests/caas/smoke.yaml.j2 index 85bbbde3..58d74818 100644 --- a/tests/caas/smoke.yaml.j2 +++ b/tests/caas/smoke.yaml.j2 @@ -4,6 +4,7 @@ applications: traefik: charm: ch:traefik-k8s channel: 1.0/candidate + base: ubuntu@20.04 scale: 1 trust: true options: @@ -11,23 +12,27 @@ applications: mysql: charm: ch:mysql-k8s channel: 8.0/stable + base: ubuntu@22.04 scale: 1 trust: true constraints: cpu-power=1000 mem=1G vault: charm: ch:vault-k8s channel: latest/edge + base: ubuntu@22.04 scale: 1 trust: false tls-operator: charm: self-signed-certificates channel: latest/beta + base: ubuntu@22.04 scale: 1 options: ca-common-name: internal-ca rabbitmq: charm: ch:rabbitmq-k8s channel: 3.12/edge + base: ubuntu@22.04 scale: 1 trust: true options: @@ -39,6 +44,7 @@ applications: charm: ch:ovn-central-k8s channel: 23.03/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -52,6 +58,7 @@ applications: charm: ch:keystone-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true options: @@ -68,6 +75,7 @@ applications: charm: ch:glance-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true storage: @@ -81,6 +89,7 @@ applications: charm: ch:heat-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -93,6 +102,7 @@ applications: charm: ch:octavia-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -106,6 +116,7 @@ applications: charm: ch:barbican-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: false resources: @@ -118,6 +129,7 @@ applications: charm: ch:magnum-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: false resources: diff --git a/tests/ceph/smoke.yaml.j2 b/tests/ceph/smoke.yaml.j2 index e78d7887..44651d4d 100644 --- a/tests/ceph/smoke.yaml.j2 +++ b/tests/ceph/smoke.yaml.j2 @@ -4,6 +4,7 @@ applications: traefik: charm: ch:traefik-k8s channel: 1.0/candidate + base: ubuntu@20.04 scale: 1 trust: true options: @@ -11,12 +12,14 @@ applications: mysql: charm: ch:mysql-k8s channel: 8.0/stable + base: ubuntu@22.04 scale: 1 trust: true constraints: cpu-power=1000 mem=1G rabbitmq: charm: ch:rabbitmq-k8s channel: 3.12/edge + base: ubuntu@22.04 scale: 1 trust: true options: @@ -28,6 +31,7 @@ applications: charm: ch:keystone-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true options: @@ -44,6 +48,7 @@ applications: charm: ch:cinder-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -56,6 +61,7 @@ applications: charm: ch:cinder-ceph-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -67,6 +73,7 @@ applications: charm: ch:gnocchi-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -79,6 +86,7 @@ applications: charm: ch:ceilometer-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -91,6 +99,7 @@ applications: charm: ch:aodh-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: diff --git a/tests/core/smoke.yaml.j2 b/tests/core/smoke.yaml.j2 index 83886992..07dd42dd 100644 --- a/tests/core/smoke.yaml.j2 +++ b/tests/core/smoke.yaml.j2 @@ -4,6 +4,7 @@ applications: traefik: charm: ch:traefik-k8s channel: 1.0/candidate + base: ubuntu@20.04 scale: 1 trust: true options: @@ -11,18 +12,21 @@ applications: mysql: charm: ch:mysql-k8s channel: 8.0/stable + base: ubuntu@22.04 scale: 1 trust: true constraints: cpu-power=1000 mem=1G tls-operator: charm: self-signed-certificates channel: latest/beta + base: ubuntu@22.04 scale: 1 options: ca-common-name: internal-ca rabbitmq: charm: ch:rabbitmq-k8s channel: 3.12/edge + base: ubuntu@22.04 scale: 1 trust: true options: @@ -34,6 +38,7 @@ applications: charm: ch:ovn-central-k8s channel: 23.03/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -47,6 +52,7 @@ applications: charm: ch:ovn-relay-k8s channel: 23.03/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -58,6 +64,7 @@ applications: charm: ch:keystone-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true options: @@ -74,6 +81,7 @@ applications: charm: ch:glance-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true storage: @@ -87,6 +95,7 @@ applications: charm: ch:nova-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -100,6 +109,7 @@ applications: charm: ch:placement-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true resources: @@ -111,23 +121,13 @@ applications: charm: ch:neutron-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true options: debug: true resources: 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: - - tls-operator:certificates @@ -192,12 +192,3 @@ relations: - ovn-central:ovsdb-cms - - keystone:send-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 diff --git a/tests/core/tests.yaml b/tests/core/tests.yaml index 821a7d54..3509dd6e 100644 --- a/tests/core/tests.yaml +++ b/tests/core/tests.yaml @@ -67,6 +67,3 @@ target_deploy_status: neutron: workload-status: active workload-status-message-regex: '^$' - horizon: - workload-status: active - workload-status-message-regex: '^$' diff --git a/tests/misc/smoke.yaml.j2 b/tests/misc/smoke.yaml.j2 index 829ed8ff..f3275a64 100644 --- a/tests/misc/smoke.yaml.j2 +++ b/tests/misc/smoke.yaml.j2 @@ -4,6 +4,7 @@ applications: traefik: charm: ch:traefik-k8s channel: 1.0/candidate + base: ubuntu@20.04 scale: 1 trust: true options: @@ -11,16 +12,19 @@ applications: mysql: charm: ch:mysql-k8s channel: 8.0/stable + base: ubuntu@22.04 scale: 1 trust: true constraints: cpu-power=1000 mem=1G ldap-server: charm: ch:ldap-test-fixture-k8s channel: edge + base: ubuntu@22.04 scale: 1 rabbitmq: charm: ch:rabbitmq-k8s channel: 3.12/edge + base: ubuntu@22.04 scale: 1 trust: true options: @@ -32,6 +36,7 @@ applications: charm: ch:keystone-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: true options: @@ -48,6 +53,7 @@ applications: charm: ch:designate-bind-k8s channel: 9/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: false resources: @@ -59,6 +65,7 @@ applications: charm: ch:designate-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 trust: false resources: @@ -70,6 +77,7 @@ applications: charm: ch:keystone-ldap-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 openstack-exporter: {% if openstack_exporter_k8s is defined and openstack_exporter_k8s is sameas true -%} @@ -78,9 +86,22 @@ applications: charm: ch:openstack-exporter-k8s channel: 2023.2/edge {% endif -%} + base: ubuntu@22.04 scale: 1 resources: 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: - - mysql:database @@ -106,3 +127,12 @@ relations: - - keystone: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 diff --git a/tests/misc/tests.yaml b/tests/misc/tests.yaml index 647232b4..2bac5e42 100644 --- a/tests/misc/tests.yaml +++ b/tests/misc/tests.yaml @@ -50,3 +50,6 @@ target_deploy_status: openstack-exporter: workload-status: active workload-status-message-regex: '^$' + horizon: + workload-status: active + workload-status-message-regex: '^$' diff --git a/tox.ini b/tox.ini index eb6f2562..b90f1e89 100644 --- a/tox.ini +++ b/tox.ini @@ -76,7 +76,7 @@ commands = [testenv:func-noop] basepython = python3 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://opendev.org/openstack/tempest.git#egg=tempest commands = @@ -86,6 +86,7 @@ commands = basepython = python3 deps = {[testenv:func-noop]deps} passenv = + HOME PYTHONPATH setenv = TEST_MODEL_SETTINGS = automatically-retry-hooks=true diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 57985000..02f69ea0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -321,8 +321,6 @@ soft: true - name: charm-build-ovn-relay-k8s soft: true - - name: charm-build-horizon-k8s - soft: true files: - ops-sunbeam/ops_sunbeam/* - charms/keystone-k8s/* @@ -332,7 +330,6 @@ - charms/placement-k8s/* - charms/ovn-central-k8s/* - charms/ovn-relay-k8s/* - - charms/horizon-k8s/* - rebuild vars: # Artifacts will be downloaded from below charm jobs @@ -344,7 +341,6 @@ - charm-build-neutron-k8s - charm-build-ovn-central-k8s - charm-build-ovn-relay-k8s - - charm-build-horizon-k8s # test_dir relative to project src dir test_dir: tests/core - job: @@ -444,12 +440,15 @@ soft: true - name: charm-build-openstack-exporter-k8s soft: true + - name: charm-build-horizon-k8s + soft: true files: - ops-sunbeam/ops_sunbeam/* - charms/designate-k8s/* - charms/designate-bind-k8s/* - charms/keystone-ldap-k8s/* - charms/openstack-exporter-k8s/* + - charms/horizon-k8s/* - rebuild vars: charm_jobs: @@ -458,6 +457,7 @@ - charm-build-keystone-ldap-k8s - charm-build-openstack-exporter-k8s - charm-build-keystone-k8s + - charm-build-horizon-k8s test_dir: tests/misc - job: name: func-test-machine diff --git a/zuul.d/zuul.yaml b/zuul.d/zuul.yaml index 2f8aceb0..5fef23fb 100644 --- a/zuul.d/zuul.yaml +++ b/zuul.d/zuul.yaml @@ -17,7 +17,7 @@ - func-test-machine: nodeset: ubuntu-jammy vars: - juju_channel: 3.2/stable + juju_channel: 3.4/stable juju_classic_mode: false env_type: k8s microk8s_channel: 1.28-strict/stable