From 2a898322f12303ec1570b2872937f0c0de6faede Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Tue, 13 Aug 2024 09:00:54 -0500
Subject: [PATCH] Simplify umbrella job to make it more stable

- Do not deploy Ceph. It is time and resoureces consuming.
  We test Ceph deployment in other jobs.
- Deploy Mariadb and Rabbitmq with local volumes
- Do not test upgrades for Mariadb and Rabbitmq
- Use ephemeral backend for Glance

Change-Id: I43a09d6938c5cfb30c78a54675e3db17d24285bf
---
 ...-changes-do-not-update-other-components.sh |  2 --
 tools/deployment/component/common/mariadb.sh  |  2 +-
 .../deployment/component/common/openstack.sh  | 23 ++++++++-----------
 tools/deployment/component/common/rabbitmq.sh |  2 +-
 zuul.d/base.yaml                              |  5 ++--
 zuul.d/project.yaml                           |  2 +-
 6 files changed, 14 insertions(+), 22 deletions(-)

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 23d559f410..839077f307 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
@@ -68,10 +68,8 @@ validate_only_expected_application_changes "glance" "--set glance.conf.logging.l
 validate_only_expected_application_changes "heat" "--set heat.conf.logging.logger_heat.level=WARN"
 validate_only_expected_application_changes "keystone" "--set keystone.conf.logging.logger_keystone.level=WARN"
 validate_only_expected_application_changes "libvirt" "--set libvirt.conf.libvirt.log_level=2"
-validate_only_expected_application_changes "mariadb" "--set mariadb.conf.database.config_override=[mysqld]\nlog_warnings=3"
 validate_only_expected_application_changes "memcached" "--set memcached.conf.memcached.stats_cachedump.enabled=false"
 validate_only_expected_application_changes "neutron" "--set neutron.conf.logging.logger_neutron.level=WARN"
 validate_only_expected_application_changes "nova" "--set nova.conf.logging.logger_nova.level=WARN"
 validate_only_expected_application_changes "openvswitch" "--set openvswitch.pod.user.nova.uid=42425"
 validate_only_expected_application_changes "placement" "--set placement.conf.logging.logger_placement.level=WARN"
-validate_only_expected_application_changes "rabbitmq" "--set rabbitmq.conf.rabbitmq.log.file.level=info"
diff --git a/tools/deployment/component/common/mariadb.sh b/tools/deployment/component/common/mariadb.sh
index db4c35ab3b..c5dbd34ddc 100755
--- a/tools/deployment/component/common/mariadb.sh
+++ b/tools/deployment/component/common/mariadb.sh
@@ -23,7 +23,7 @@ set -xe
 helm upgrade --install mariadb ${OSH_INFRA_HELM_REPO}/mariadb \
     --namespace=openstack \
     --set pod.replicas.server=1 \
-    ${VOLUME_HELM_ARGS:="--set volume.use_local_path_for_single_pod_cluster.enabled=true --set volume.enabled=false"} \
+    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path_for_single_pod_cluster.enabled=true"} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_MARIADB}
 
diff --git a/tools/deployment/component/common/openstack.sh b/tools/deployment/component/common/openstack.sh
index 94221ebd72..678ddddc59 100755
--- a/tools/deployment/component/common/openstack.sh
+++ b/tools/deployment/component/common/openstack.sh
@@ -17,7 +17,6 @@ set -xe
 #NOTE: Define variables
 : ${OSH_HELM_REPO:="../openstack-helm"}
 : ${OSH_PATH:="../openstack-helm"}
-export OSH_TEST_TIMEOUT=1200
 export OS_CLOUD=openstack_helm
 : "${RUN_HELM_TESTS:="no"}"
 : "${CEPH_ENABLED:="false"}"
@@ -25,13 +24,9 @@ export OS_CLOUD=openstack_helm
 release=openstack
 namespace=$release
 
+
 : ${GLANCE_BACKEND:="pvc"}
-tee /tmp/glance.yaml <<EOF
-glance:
-  storage: ${GLANCE_BACKEND}
-  volume:
-    class_name: general
-EOF
+
 #NOTE: Deploy neutron
 tee /tmp/neutron.yaml << EOF
 neutron:
@@ -115,11 +110,17 @@ helm upgrade --install $release ${OSH_HELM_REPO}/openstack \
   ${OSH_EXTRA_HELM_VIRT_ARGS} \
   ${OSH_EXTRA_HELM_ARGS} \
   --set glance.conf.glance.keystone_authtoken.memcache_secret_key="$(openssl rand -hex 64)" \
+  --set glance.storage=${GLANCE_BACKEND} \
   --set nova.bootstrap.wait_for_computes.enabled=true \
   --set libvirt.conf.ceph.enabled=${CEPH_ENABLED} \
   --set nova.conf.ceph.enabled=${CEPH_ENABLED} \
   --values=/tmp/neutron.yaml \
-  --values=/tmp/glance.yaml \
+  --set mariadb.pod.replicas.server=1 \
+  --set mariadb.volume.enabled=false \
+  --set mariadb.volume.use_local_path_for_single_pod_cluster.enabled=true \
+  --set rabbitmq.pod.replicas.server=1 \
+  --set rabbitmq.volume.enabled=false \
+  --set rabbitmq.volume.use_local_path.enabled=true \
   --namespace=$namespace \
   --timeout=1200s
 
@@ -142,9 +143,3 @@ sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and rest
 openstack compute service list
 openstack network agent list
 openstack hypervisor list
-
-if [ "${RUN_HELM_TESTS}" == "no" ]; then
-    exit 0
-fi
-
-./tools/deployment/common/run-helm-tests.sh $chart $release
diff --git a/tools/deployment/component/common/rabbitmq.sh b/tools/deployment/component/common/rabbitmq.sh
index 4c5a044810..9035db24c6 100755
--- a/tools/deployment/component/common/rabbitmq.sh
+++ b/tools/deployment/component/common/rabbitmq.sh
@@ -24,7 +24,7 @@ helm upgrade --install rabbitmq ${OSH_INFRA_HELM_REPO}/rabbitmq \
     --namespace=openstack \
     --set pod.replicas.server=1 \
     --timeout=600s \
-    ${VOLUME_HELM_ARGS:="--set volume.enabled=false"} \
+    ${VOLUME_HELM_ARGS:="--set volume.enabled=false --set volume.use_local_path.enabled=true"} \
     ${OSH_EXTRA_HELM_ARGS:=} \
     ${OSH_EXTRA_HELM_ARGS_RABBITMQ}
 
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 7d3465368e..8c908da67b 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -299,9 +299,8 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/common/ingress.sh
-        - ./tools/deployment/component/ceph/ceph-rook.sh
-        - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/component/common/openstack.sh
+        - export GLANCE_BACKEND=memory; ./tools/deployment/component/common/openstack.sh
+        - export HELM_TESTS_TRIES=3; export OSH_TEST_TIMEOUT=1200; ./tools/deployment/common/run-helm-tests.sh openstack
         - ./tools/deployment/common/use-it.sh
         - ./tools/deployment/common/force-cronjob-run.sh
         - ./tools/deployment/common/validate-umbrella-upgrade-no-side-effects.sh
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ce903b82bc..f8ce346776 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -34,7 +34,7 @@
         - openstack-helm-compute-kit-2023-2-ubuntu_jammy  # 3 nodes
         - openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy  # 3 nodes
         # 2024.1
-        - openstack-helm-umbrella-2024-1-ubuntu_jammy  # 3 nodes rook
+        - openstack-helm-umbrella-2024-1-ubuntu_jammy  # 3 nodes
         - 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