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:
parent
0a858c4be8
commit
a3d7eaf28c
|
@ -138,6 +138,7 @@
|
|||
provides: nodepool-siblings-container-image
|
||||
vars:
|
||||
zuul_work_dir: "{{ zuul.projects['opendev.org/zuul/nodepool'].src_dir }}"
|
||||
container_command: docker --debug
|
||||
container_images:
|
||||
- context: .
|
||||
registry: quay.io
|
||||
|
@ -231,6 +232,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:
|
||||
|
|
|
@ -92,9 +92,13 @@
|
|||
dest: /etc/nodepool/docker-compose.yaml
|
||||
mode: 0600
|
||||
|
||||
- name: Dump zuul details
|
||||
debug:
|
||||
msg: '{{ zuul }}'
|
||||
|
||||
- name: Run docker compose pull
|
||||
shell:
|
||||
cmd: docker-compose pull
|
||||
cmd: docker-compose --verbose pull
|
||||
chdir: /etc/nodepool
|
||||
|
||||
- name: Run docker compose up
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue