openstack/openstack-helm
Code Issues Proposed changes

Minor fixes for tests

Browse Source 
* 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
This commit is contained in:
Vladimir Kozhukalov 2024-12-19 21:09:13 -06:00
parent 79f3ddfa17
commit 1425f5426c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/deployment/common/setup-client.sh
View File

@ -59,6 +59,6 @@ sudo docker run \\
-v /etc/openstack-helm:/etc/openstack-helm \\ -v /etc/openstack-helm:/etc/openstack-helm \\
-e OS_CLOUD=\${OS_CLOUD} \\ -e OS_CLOUD=\${OS_CLOUD} \\
\${OPENSTACK_CLIENT_CONTAINER_EXTRA_ARGS} \\ \${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 EOF
sudo chmod +x /usr/local/bin/openstack sudo chmod +x /usr/local/bin/openstack

2
tools/deployment/common/use-it.sh
View File

@ -153,7 +153,7 @@ if openstack service list -f value -c Type | grep -q "^volume"; then
DEVS_PRE_ATTACH=$(mktemp) DEVS_PRE_ATTACH=$(mktemp)
ssh -i ${SSH_DIR}/osh_key ${IMAGE_USER}@${FLOATING_IP} lsblk > ${DEVS_PRE_ATTACH} 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 # Create and attach a block device to the instance
openstack stack create --wait \ openstack stack create --wait \
--parameter instance_uuid=${INSTANCE_ID} \ --parameter instance_uuid=${INSTANCE_ID} \

5
zuul.d/base.yaml
View File

@ -42,7 +42,7 @@
- ^.*\.rst.gotmpl$ - ^.*\.rst.gotmpl$
- ^doc/.*$ - ^doc/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
timeout: 7200 timeout: 10800
pre-run: pre-run:
- tools/gate/playbooks/prepare-hosts.yaml - tools/gate/playbooks/prepare-hosts.yaml
- tools/gate/playbooks/inject-keys.yaml - tools/gate/playbooks/inject-keys.yaml
@ -75,6 +75,9 @@
name: openstack-helm-deploy-kubespray name: openstack-helm-deploy-kubespray
parent: openstack-helm-deploy parent: openstack-helm-deploy
abstract: true abstract: true
# NOTE(kozhukalov): Temporarily disable voting for this job
# due to image pull rate limits on Docker Hub.
voting: false
run: run:
- tools/gate/playbooks/deploy-env-kubespray.yaml - tools/gate/playbooks/deploy-env-kubespray.yaml
- tools/gate/playbooks/run-scripts.yaml - tools/gate/playbooks/run-scripts.yaml