zuul
/
nodepool
Code Issues Proposed changes

CI: switch nodepool-functional-container-openstack to quay.io 

Since infra was switching to quay.io we hit problems with speculative
testing, because docker won't pull the images from zuul's buildset
registry, so switch them to quay.io too.

Change-Id: Ie265aae6b98c1d1fa9fab085bcd46fb6b9bc43d7
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2023-05-29 17:39:24 +03:00
parent 0a858c4be8
commit 90bb09c518
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -231,6 +231,7 @@
- name: opendev/glean # note, installed by dib
- name: zuul/nodepool
vars:
nodepool_buildset_registry: 'zuul-jobs.buildset-registry:5000/quay.io/zuul-ci'
nodepool_container_tag: ':siblings'
- job:

4
playbooks/nodepool-functional-container-openstack/templates/docker-compose.yaml.j2
View File

@ -5,7 +5,7 @@ volumes:
services:
nodepool-builder:
image: zuul/nodepool-builder{{ nodepool_container_tag|default('') }}
image: {{ nodepool_buildset_registry|default('zuul') }}/nodepool-builder{{ nodepool_container_tag|default('') }}
network_mode: host
restart: always
@ -33,7 +33,7 @@ services:
- /opt/zookeeper/ca:/opt/zookeeper/ca:ro
nodepool-launcher:
image: zuul/nodepool-launcher{{ nodepool_container_tag|default('') }}
image: {{ nodepool_buildset_registry|default('zuul') }}/nodepool-launcher{{ nodepool_container_tag|default('') }}
network_mode: host
restart: always