From b4978e8e60e987618cbd113f7f88a97bfac1f25d Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Mon, 1 Nov 2021 15:57:21 -0500
Subject: [PATCH] Update periodic/experimental jobs to helm v3

This change updates the experimental jobs that are
currently working to use helm v3. Later changes should
fix the other issues that they are currently experiencing.

Change-Id: I068a9bb835e1bde4d11d8dee0352c49248c20b15
---
 tools/deployment/common/deploy-k8s.sh |  2 +-
 zuul.d/jobs-openstack-helm.yaml       | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/deployment/common/deploy-k8s.sh b/tools/deployment/common/deploy-k8s.sh
index 0e31879a5f..db2b264da1 100755
--- a/tools/deployment/common/deploy-k8s.sh
+++ b/tools/deployment/common/deploy-k8s.sh
@@ -17,5 +17,5 @@ set -xe
 CURRENT_DIR="$(pwd)"
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
 cd ${OSH_INFRA_PATH}
-./tools/deployment/common/005-deploy-k8s.sh
+./tools/gate/deploy-k8s.sh
 cd ${CURRENT_DIR}
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 26ecca74df..a7bc727009 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -321,7 +321,6 @@
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/horizon/horizon.sh
         - ./tools/deployment/component/heat/heat.sh
@@ -376,13 +375,12 @@
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
-        - - ./tools/deployment/common/deploy-k8s.sh
-          - ./tools/deployment/common/setup-client.sh
+        - ./tools/deployment/common/deploy-k8s.sh
+        - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/ingress.sh
         - - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
           - ./tools/deployment/component/common/rabbitmq.sh
-          - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - - ./tools/deployment/component/compute-kit/tungsten-fabric.sh checkdns
           - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns
           - ./tools/deployment/component/keystone/keystone.sh
@@ -412,13 +410,12 @@
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
-        - - ./tools/deployment/common/deploy-k8s.sh
-          - ./tools/deployment/common/setup-client.sh
+        - ./tools/deployment/common/deploy-k8s.sh
+        - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/common/ingress.sh
         - - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
           - ./tools/deployment/component/common/rabbitmq.sh
-          - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - - ./tools/deployment/component/compute-kit/tungsten-fabric.sh checkdns
           - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns
           - ./tools/deployment/component/keystone/keystone.sh
@@ -449,7 +446,6 @@
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/heat/heat.sh
         - ./tools/deployment/component/glance/glance.sh