zuul/zuul-jobs
Code Issues Proposed changes

test-registry: split docker and container paths

Browse Source 
This ended up calling into push-to-intermediate-registry with both
docker_images *and* container_images variable set.

This hid from testing that push-to-intermeidate-registry was not
working with only the container_images variable set.

Split these calls up so we don't have both variables defined.

Change-Id: If84b039852f2afc4df66c98e64fcce6f30f51246
This commit is contained in:
Ian Wienand 2023-03-24 11:45:28 +11:00
parent d1e74606bc
commit 0ad671bfbf
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test-playbooks/registry/test-registry.yaml
View File

@ -23,14 +23,22 @@
- name: Set up user credentials for the intermediate registry
include_role:
name: intermediate-registry-user-config
- name: "Build a container image for the previous build"
- name: "Build a container image for the previous build with docker roles"
when: container_command == 'docker'
include_role:
name: "build-{{ (container_command == 'docker') | ternary('docker', 'container') }}-image"
name: "build-docker-image"
vars:
docker_images:
- context: test-playbooks/registry/docker
repository: "{{ previous_build_repository }}"
container_images: "{{ docker_images }}"
- name: "Build a container image for the previous build with container-image roles"
when: container_command != 'docker'
include_role:
name: "build-container-image"
vars:
container_images:
- context: test-playbooks/registry/docker
repository: "{{ previous_build_repository }}"
- name: Tag the previous build
command: "{{ container_command }} tag {{ previous_build_repository }}:latest localhost:5000/{{ previous_build_repository }}:{{ previous_build_uuid }}_latest"
- name: Push the previous build to the intermediate registry