openstack/openstack-helm
Code Issues Proposed changes

Run umbrella and tls test jobs on multinode envs

Browse Source 
- 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
This commit is contained in:
Vladimir Kozhukalov 2024-07-26 05:54:55 -05:00
parent 002c21ff25
commit 157cfe621c
12 changed files with 36 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/Chart.yaml
View File

@ -57,6 +57,6 @@ dependencies:
description: A chart for openstack helm commmon deployment items description: A chart for openstack helm commmon deployment items
name: openstack name: openstack
type: application type: application
version: 0.2.16 version: 0.2.17
maintainers: maintainers:
- name: OpenStack-Helm Authors - name: OpenStack-Helm Authors

9
openstack/values.yaml
View File

@ -16,11 +16,6 @@ helm-toolkit:
rabbitmq: rabbitmq:
release_group: rabbitmq release_group: rabbitmq
enabled: true enabled: true
volume:
enabled: false
use_local_path:
enabled: true
host_path: /tmp/rabbitmq-data
pod: pod:
replicas: replicas:
server: 1 server: 1
@ -31,10 +26,6 @@ mariadb:
pod: pod:
replicas: replicas:
server: 1 server: 1
volume:
enabled: false
use_local_path_for_single_pod_cluster:
enabled: true
memcached: memcached:
release_group: memcached release_group: memcached

1
releasenotes/notes/openstack.yaml
View File

@ -25,4 +25,5 @@ openstack:
- 0.2.14 Add 2024.1 overrides - 0.2.14 Add 2024.1 overrides
- 0.2.15 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.16 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
- 0.2.17 Update default values to work on multinode cluster
... ...

3
tools/deployment/common/cert-manager.sh
View File

@ -126,7 +126,8 @@ helm repo update
helm install cert-manager jetstack/cert-manager --namespace cert-manager \ helm install cert-manager jetstack/cert-manager --namespace cert-manager \
--version ${CERT_MANAGER_VERSION} \ --version ${CERT_MANAGER_VERSION} \
--set installCRDs=true \ --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 helm repo remove jetstack

5
tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.sh
View File

@ -2,6 +2,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
: ${OSH_HELM_REPO:="../openstack-helm"}
# This test case aims to prove that updating a subhcart's configuration for # This test case aims to prove that updating a subhcart's configuration for
# the OpenStack Umbrella Helm chart results in no other subcharts' components # the OpenStack Umbrella Helm chart results in no other subcharts' components
# being updated. # being updated.
@ -31,10 +33,11 @@ validate_only_expected_application_changes () {
-l "application=$app_name" \ -l "application=$app_name" \
--wait --wait
helm upgrade openstack ./openstack \ helm upgrade openstack ${OSH_HELM_REPO}/openstack \
--namespace openstack \ --namespace openstack \
--reuse-values \ --reuse-values \
${config_change} \ ${config_change} \
--timeout=600s \
--wait --wait
helm osh wait-for-pods openstack helm osh wait-for-pods openstack

4
tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
: ${OSH_HELM_REPO:="../openstack-helm"}
# This test confirms that upgrading a OpenStack Umbrella Helm release using # This test confirms that upgrading a OpenStack Umbrella Helm release using
# --reuse-values does not result in any unexpected pods from being recreated. # --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. # 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 \ --output custom-columns=Kind:.kind,Name:.metadata.name,Generation:.status.observedGeneration \
> "$before_apps_list" > "$before_apps_list"
helm upgrade openstack ./openstack \ helm upgrade openstack ${OSH_HELM_REPO}/openstack \
--namespace openstack \ --namespace openstack \
--reuse-values \ --reuse-values \
--wait --wait

42
zuul.d/2023.1.yaml
View File

@ -84,48 +84,6 @@
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: jammy 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: - job:
name: openstack-helm-tacker-2023-1-ubuntu_focal name: openstack-helm-tacker-2023-1-ubuntu_focal
parent: openstack-helm-tacker parent: openstack-helm-tacker

21
zuul.d/2023.2.yaml
View File

@ -75,24 +75,3 @@
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: jammy container_distro_version: jammy
feature_gates: ovn 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

4
zuul.d/2024.1.yaml
View File

@ -113,7 +113,7 @@
- job: - job:
name: openstack-helm-umbrella-2024-1-ubuntu_jammy name: openstack-helm-umbrella-2024-1-ubuntu_jammy
parent: openstack-helm-umbrella parent: openstack-helm-umbrella
nodeset: openstack-helm-1node-32GB-ubuntu_jammy nodeset: openstack-helm-3nodes-ubuntu_jammy
vars: vars:
osh_params: osh_params:
openstack_release: "2024.1" openstack_release: "2024.1"
@ -123,7 +123,7 @@
- job: - job:
name: openstack-helm-tls-2024-1-ubuntu_jammy name: openstack-helm-tls-2024-1-ubuntu_jammy
parent: openstack-helm-tls parent: openstack-helm-tls
nodeset: openstack-helm-1node-32GB-ubuntu_jammy nodeset: openstack-helm-5nodes-ubuntu_jammy
vars: vars:
osh_params: osh_params:
openstack_release: "2024.1" openstack_release: "2024.1"

40
zuul.d/base.yaml
View File

@ -299,9 +299,11 @@
- ./tools/deployment/common/prepare-charts.sh - ./tools/deployment/common/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh - ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/ingress.sh - ./tools/deployment/common/ingress.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh - ./tools/deployment/component/ceph/ceph-rook.sh
- - ./tools/deployment/common/use-it.sh - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
- ./tools/deployment/common/force-cronjob-run.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-no-side-effects.sh
- ./tools/deployment/common/validate-umbrella-upgrade-config-changes-do-not-update-other-components.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/prepare-charts.sh
- ./tools/deployment/common/setup-client.sh - ./tools/deployment/common/setup-client.sh
- ./tools/deployment/common/cert-manager.sh - ./tools/deployment/common/cert-manager.sh
- ./tools/deployment/component/ceph/ceph.sh - ./tools/deployment/component/ceph/ceph-rook.sh
- ./tools/deployment/component/ceph/ceph-ns-activate.sh - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
- ./tools/deployment/common/ingress.sh - ./tools/deployment/common/ingress.sh
- - ./tools/deployment/component/common/mariadb.sh - ./tools/deployment/component/common/mariadb.sh
- ./tools/deployment/component/common/memcached.sh - ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/common/rabbitmq.sh - ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/keystone/keystone.sh - ./tools/deployment/component/keystone/keystone.sh
- - ./tools/deployment/component/cinder/cinder.sh - ./tools/deployment/component/cinder/cinder.sh
- ./tools/deployment/component/heat/heat.sh - ./tools/deployment/component/heat/heat.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh - ./tools/deployment/component/glance/glance.sh
- ./tools/deployment/component/compute-kit/openvswitch.sh - ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh - ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh - ./tools/deployment/component/compute-kit/compute-kit.sh
- - export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron - 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 nova
./tools/deployment/common/run-helm-tests.sh glance; - ./tools/deployment/common/run-helm-tests.sh glance
./tools/deployment/common/run-helm-tests.sh keystone; - ./tools/deployment/common/run-helm-tests.sh keystone
./tools/deployment/common/run-helm-tests.sh cinder; - ./tools/deployment/common/run-helm-tests.sh cinder
- - ./tools/deployment/common/use-it.sh - ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh - ./tools/deployment/common/force-cronjob-run.sh
- job: - job:
name: openstack-helm-tungsten-fabric name: openstack-helm-tungsten-fabric

7
zuul.d/project.yaml
View File

@ -30,17 +30,15 @@
- openstack-helm-cinder-2023-1-ubuntu_focal # 3 nodes - 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_focal # 3 nodes
- openstack-helm-compute-kit-2023-1-ubuntu_jammy # 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 # 2023.2
- openstack-helm-horizon-2023-2-ubuntu_jammy # 1 node - openstack-helm-horizon-2023-2-ubuntu_jammy # 1 node
- openstack-helm-keystone-ldap-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-cinder-2023-2-ubuntu_jammy # 3 nodes rook
- openstack-helm-compute-kit-2023-2-ubuntu_jammy # 3 nodes - 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 - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy # 3 nodes
# 2024.1 # 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-cinder-2024-1-ubuntu_jammy # 3 nodes rook
- openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes - openstack-helm-compute-kit-2024-1-ubuntu_jammy # 3 nodes
- openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy # 1 node + 2 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-apparmor-cinder-2023-1-ubuntu_focal
- openstack-helm-netpol-compute-kit-2023-1-ubuntu_focal - openstack-helm-netpol-compute-kit-2023-1-ubuntu_focal
- openstack-helm-netpol-cinder-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-tungsten-fabric-2023-1-ubuntu_focal
- openstack-helm-tacker-2023-1-ubuntu_focal - openstack-helm-tacker-2023-1-ubuntu_focal
periodic: periodic:

20
zuul.d/zed.yaml
View File

@ -70,23 +70,3 @@
openstack_release: zed openstack_release: zed
container_distro_name: ubuntu container_distro_name: ubuntu
container_distro_version: jammy 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