From 1425f5426ca09e3cd86aeffb4dbef4e4d5cdf861 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 19 Dec 2024 21:09:13 -0600
Subject: [PATCH] Minor fixes for tests

* Update the openstack-client image url to
  avoid Docker Hub rate limits.
* One line fix for use-it.sh script
* Temporarily disable voting for the Kubespray job
  because it often encounters Docker Hub rate limits.
* Increase jobs timeout

Depends-On: I58946e6fc63d726e08d83ea7f96e7fef140ddf21
Change-Id: Iae92c73135391a930f1c1dc95dadce424678aee3
---
 tools/deployment/common/setup-client.sh | 2 +-
 tools/deployment/common/use-it.sh       | 2 +-
 zuul.d/base.yaml                        | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 8cd7b729cc..7f51946b1b 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -59,6 +59,6 @@ sudo docker run \\
     -v /etc/openstack-helm:/etc/openstack-helm \\
     -e OS_CLOUD=\${OS_CLOUD} \\
     \${OPENSTACK_CLIENT_CONTAINER_EXTRA_ARGS} \\
-    docker.io/openstackhelm/openstack-client:\${OPENSTACK_RELEASE:-2024.2} openstack "\${args[@]}"
+    quay.io/airshipit/openstack-client:\${OPENSTACK_RELEASE:-2024.2} openstack "\${args[@]}"
 EOF
 sudo chmod +x /usr/local/bin/openstack
diff --git a/tools/deployment/common/use-it.sh b/tools/deployment/common/use-it.sh
index a0097c0b31..f346033de6 100755
--- a/tools/deployment/common/use-it.sh
+++ b/tools/deployment/common/use-it.sh
@@ -153,7 +153,7 @@ if openstack service list -f value -c Type | grep -q "^volume"; then
   DEVS_PRE_ATTACH=$(mktemp)
   ssh -i ${SSH_DIR}/osh_key ${IMAGE_USER}@${FLOATING_IP} lsblk > ${DEVS_PRE_ATTACH}
 
-  openstack stack list show "heat-vm-volume-attach" || \
+  openstack stack show "heat-vm-volume-attach" || \
   # Create and attach a block device to the instance
     openstack stack create --wait \
       --parameter instance_uuid=${INSTANCE_ID} \
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 5558679d3e..d7114df32d 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -42,7 +42,7 @@
       - ^.*\.rst.gotmpl$
       - ^doc/.*$
       - ^releasenotes/.*$
-    timeout: 7200
+    timeout: 10800
     pre-run:
       - tools/gate/playbooks/prepare-hosts.yaml
       - tools/gate/playbooks/inject-keys.yaml
@@ -75,6 +75,9 @@
     name: openstack-helm-deploy-kubespray
     parent: openstack-helm-deploy
     abstract: true
+    # NOTE(kozhukalov): Temporarily disable voting for this job
+    # due to image pull rate limits on Docker Hub.
+    voting: false
     run:
       - tools/gate/playbooks/deploy-env-kubespray.yaml
       - tools/gate/playbooks/run-scripts.yaml