From 157cfe621cb2d99fc20b149cb80d328531818a37 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Fri, 26 Jul 2024 05:54:55 -0500 Subject: [PATCH] Run umbrella and tls test jobs on multinode envs - Run TLS job on multinode env (5 nodes). - Run umbrella job on multinode env. Update openstack umbrella chart values to work on multiple nodes (deploy mariadb and rabbit with general storage class). Change-Id: I50eabc2e56646c2e75cc84aad2280a6bb1a44df0 --- openstack/Chart.yaml | 2 +- openstack/values.yaml | 9 ---- releasenotes/notes/openstack.yaml | 1 + tools/deployment/common/cert-manager.sh | 3 +- ...-changes-do-not-update-other-components.sh | 5 ++- ...lidate-umbrella-upgrade-no-side-effects.sh | 4 +- zuul.d/2023.1.yaml | 42 ------------------- zuul.d/2023.2.yaml | 21 ---------- zuul.d/2024.1.yaml | 4 +- zuul.d/base.yaml | 40 +++++++++--------- zuul.d/project.yaml | 7 +--- zuul.d/zed.yaml | 20 --------- 12 files changed, 36 insertions(+), 122 deletions(-) diff --git a/openstack/Chart.yaml b/openstack/Chart.yaml index 04cf762a74..16c21713c3 100644 --- a/openstack/Chart.yaml +++ b/openstack/Chart.yaml @@ -57,6 +57,6 @@ dependencies: description: A chart for openstack helm commmon deployment items name: openstack type: application -version: 0.2.16 +version: 0.2.17 maintainers: - name: OpenStack-Helm Authors diff --git a/openstack/values.yaml b/openstack/values.yaml index 31ab3044b9..20f906f91f 100644 --- a/openstack/values.yaml +++ b/openstack/values.yaml @@ -16,11 +16,6 @@ helm-toolkit: rabbitmq: release_group: rabbitmq enabled: true - volume: - enabled: false - use_local_path: - enabled: true - host_path: /tmp/rabbitmq-data pod: replicas: server: 1 @@ -31,10 +26,6 @@ mariadb: pod: replicas: server: 1 - volume: - enabled: false - use_local_path_for_single_pod_cluster: - enabled: true memcached: release_group: memcached diff --git a/releasenotes/notes/openstack.yaml b/releasenotes/notes/openstack.yaml index 6ed58bfc88..ca49041925 100644 --- a/releasenotes/notes/openstack.yaml +++ b/releasenotes/notes/openstack.yaml @@ -25,4 +25,5 @@ openstack: - 0.2.14 Add 2024.1 overrides - 0.2.15 Add 2024.1 overrides - 0.2.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.2.17 Update default values to work on multinode cluster ... diff --git a/tools/deployment/common/cert-manager.sh b/tools/deployment/common/cert-manager.sh index 75646f1bd5..9c62ae1a4a 100755 --- a/tools/deployment/common/cert-manager.sh +++ b/tools/deployment/common/cert-manager.sh @@ -126,7 +126,8 @@ helm repo update helm install cert-manager jetstack/cert-manager --namespace cert-manager \ --version ${CERT_MANAGER_VERSION} \ --set installCRDs=true \ - --set extraArgs[0]="--enable-certificate-owner-ref=true" + --set extraArgs[0]="--enable-certificate-owner-ref=true" \ + --timeout=600s helm repo remove jetstack diff --git a/tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh b/tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh index 9ef05884a1..23d559f410 100755 --- a/tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh +++ b/tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh @@ -2,6 +2,8 @@ set -ex set -o pipefail +: ${OSH_HELM_REPO:="../openstack-helm"} + # This test case aims to prove that updating a subhcart's configuration for # the OpenStack Umbrella Helm chart results in no other subcharts' components # being updated. @@ -31,10 +33,11 @@ validate_only_expected_application_changes () { -l "application=$app_name" \ --wait - helm upgrade openstack ./openstack \ + helm upgrade openstack ${OSH_HELM_REPO}/openstack \ --namespace openstack \ --reuse-values \ ${config_change} \ + --timeout=600s \ --wait helm osh wait-for-pods openstack diff --git a/tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh b/tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh index 6e34e6b2b8..99eac8728a 100755 --- a/tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh +++ b/tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh @@ -1,6 +1,8 @@ #!/bin/bash set -ex +: ${OSH_HELM_REPO:="../openstack-helm"} + # This test confirms that upgrading a OpenStack Umbrella Helm release using # --reuse-values does not result in any unexpected pods from being recreated. # Ideally, no pods would be created if the upgrade has no configuration change. @@ -24,7 +26,7 @@ kubectl get daemonsets,deployments,statefulsets \ --output custom-columns=Kind:.kind,Name:.metadata.name,Generation:.status.observedGeneration \ > "$before_apps_list" -helm upgrade openstack ./openstack \ +helm upgrade openstack ${OSH_HELM_REPO}/openstack \ --namespace openstack \ --reuse-values \ --wait diff --git a/zuul.d/2023.1.yaml b/zuul.d/2023.1.yaml index 153a29e3f9..78d4f1ba88 100644 --- a/zuul.d/2023.1.yaml +++ b/zuul.d/2023.1.yaml @@ -84,48 +84,6 @@ container_distro_name: ubuntu container_distro_version: jammy -- job: - name: openstack-helm-umbrella-2023-1-ubuntu_focal - parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_focal - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-umbrella-2023-1-ubuntu_jammy - parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_jammy - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: jammy - -- job: - name: openstack-helm-tls-2023-1-ubuntu_focal - parent: openstack-helm-tls - nodeset: openstack-helm-1node-32GB-ubuntu_focal - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: focal - feature_gates: tls - -- job: - name: openstack-helm-tls-2023-1-ubuntu_jammy - parent: openstack-helm-tls - nodeset: openstack-helm-1node-32GB-ubuntu_jammy - vars: - osh_params: - openstack_release: "2023.1" - container_distro_name: ubuntu - container_distro_version: jammy - feature_gates: tls - - job: name: openstack-helm-tacker-2023-1-ubuntu_focal parent: openstack-helm-tacker diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml index 5842ad58af..3de5665fa6 100644 --- a/zuul.d/2023.2.yaml +++ b/zuul.d/2023.2.yaml @@ -75,24 +75,3 @@ container_distro_name: ubuntu container_distro_version: jammy feature_gates: ovn - -- job: - name: openstack-helm-umbrella-2023-2-ubuntu_jammy - parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_jammy - vars: - osh_params: - openstack_release: "2023.2" - container_distro_name: ubuntu - container_distro_version: jammy - -- job: - name: openstack-helm-tls-2023-2-ubuntu_jammy - parent: openstack-helm-tls - nodeset: openstack-helm-1node-32GB-ubuntu_jammy - vars: - osh_params: - openstack_release: "2023.2" - container_distro_name: ubuntu - container_distro_version: jammy - feature_gates: tls diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml index 3b939ac36f..eabdbfee9f 100644 --- a/zuul.d/2024.1.yaml +++ b/zuul.d/2024.1.yaml @@ -113,7 +113,7 @@ - job: name: openstack-helm-umbrella-2024-1-ubuntu_jammy parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_jammy + nodeset: openstack-helm-3nodes-ubuntu_jammy vars: osh_params: openstack_release: "2024.1" @@ -123,7 +123,7 @@ - job: name: openstack-helm-tls-2024-1-ubuntu_jammy parent: openstack-helm-tls - nodeset: openstack-helm-1node-32GB-ubuntu_jammy + nodeset: openstack-helm-5nodes-ubuntu_jammy vars: osh_params: openstack_release: "2024.1" diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 9b63c1fb98..35449d8da0 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -299,9 +299,11 @@ - ./tools/deployment/common/prepare-charts.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/common/ingress.sh - - export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh - - - ./tools/deployment/common/use-it.sh - - ./tools/deployment/common/force-cronjob-run.sh + - ./tools/deployment/component/ceph/ceph-rook.sh + - ./tools/deployment/component/ceph/ceph-adapter-rook.sh + - ./tools/deployment/component/common/openstack.sh + - ./tools/deployment/common/use-it.sh + - ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh - ./tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh @@ -335,26 +337,26 @@ - ./tools/deployment/common/prepare-charts.sh - ./tools/deployment/common/setup-client.sh - ./tools/deployment/common/cert-manager.sh - - ./tools/deployment/component/ceph/ceph.sh - - ./tools/deployment/component/ceph/ceph-ns-activate.sh + - ./tools/deployment/component/ceph/ceph-rook.sh + - ./tools/deployment/component/ceph/ceph-adapter-rook.sh - ./tools/deployment/common/ingress.sh - - - ./tools/deployment/component/common/mariadb.sh - - ./tools/deployment/component/common/memcached.sh - - ./tools/deployment/component/common/rabbitmq.sh + - ./tools/deployment/component/common/mariadb.sh + - ./tools/deployment/component/common/memcached.sh + - ./tools/deployment/component/common/rabbitmq.sh - ./tools/deployment/component/keystone/keystone.sh - - - ./tools/deployment/component/cinder/cinder.sh - - ./tools/deployment/component/heat/heat.sh - - export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - - ./tools/deployment/component/compute-kit/openvswitch.sh + - ./tools/deployment/component/cinder/cinder.sh + - ./tools/deployment/component/heat/heat.sh + - ./tools/deployment/component/glance/glance.sh + - ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/compute-kit.sh - - - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron - - ./tools/deployment/common/run-helm-tests.sh nova; - ./tools/deployment/common/run-helm-tests.sh glance; - ./tools/deployment/common/run-helm-tests.sh keystone; - ./tools/deployment/common/run-helm-tests.sh cinder; - - - ./tools/deployment/common/use-it.sh - - ./tools/deployment/common/force-cronjob-run.sh + - export OSH_TEST_TIMEOUT=1200; ./tools/deployment/common/run-helm-tests.sh neutron + - ./tools/deployment/common/run-helm-tests.sh nova + - ./tools/deployment/common/run-helm-tests.sh glance + - ./tools/deployment/common/run-helm-tests.sh keystone + - ./tools/deployment/common/run-helm-tests.sh cinder + - ./tools/deployment/common/use-it.sh + - ./tools/deployment/common/force-cronjob-run.sh - job: name: openstack-helm-tungsten-fabric diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index c0616ac11f..f231944c0a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -30,17 +30,15 @@ - openstack-helm-cinder-2023-1-ubuntu_focal # 3 nodes - openstack-helm-compute-kit-2023-1-ubuntu_focal # 3 nodes - openstack-helm-compute-kit-2023-1-ubuntu_jammy # 3 nodes - # the job is faling with the error 'Node request 300-0024195009 failed' - # - openstack-helm-tls-2023-1-ubuntu_focal # 1 node 32GB # 2023.2 - openstack-helm-horizon-2023-2-ubuntu_jammy # 1 node - openstack-helm-keystone-ldap-2023-2-ubuntu_jammy # 1 node - openstack-helm-cinder-2023-2-ubuntu_jammy # 3 nodes rook - openstack-helm-compute-kit-2023-2-ubuntu_jammy # 3 nodes - - openstack-helm-umbrella-2023-2-ubuntu_jammy # 1 node 32GB - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy # 3 nodes # 2024.1 - - openstack-helm-tls-2024-1-ubuntu_jammy # 1 node 32GB + - openstack-helm-umbrella-2024-1-ubuntu_jammy # 3 nodes rook + - openstack-helm-tls-2024-1-ubuntu_jammy # 3 nodes rook - openstack-helm-cinder-2024-1-ubuntu_jammy # 3 nodes rook - openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes - openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 nodes @@ -60,7 +58,6 @@ - openstack-helm-apparmor-cinder-2023-1-ubuntu_focal - openstack-helm-netpol-compute-kit-2023-1-ubuntu_focal - openstack-helm-netpol-cinder-2023-1-ubuntu_focal - - openstack-helm-tls-2023-1-ubuntu_focal - openstack-helm-tungsten-fabric-2023-1-ubuntu_focal - openstack-helm-tacker-2023-1-ubuntu_focal periodic: diff --git a/zuul.d/zed.yaml b/zuul.d/zed.yaml index ccdec46953..30e64e6e26 100644 --- a/zuul.d/zed.yaml +++ b/zuul.d/zed.yaml @@ -70,23 +70,3 @@ openstack_release: zed container_distro_name: ubuntu container_distro_version: jammy - -- job: - name: openstack-helm-umbrella-zed-ubuntu_focal - parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_focal - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: focal - -- job: - name: openstack-helm-umbrella-zed-ubuntu_jammy - parent: openstack-helm-umbrella - nodeset: openstack-helm-1node-32GB-ubuntu_jammy - vars: - osh_params: - openstack_release: zed - container_distro_name: ubuntu - container_distro_version: jammy