From 0ad671bfbfa2c8772faa859ee2468bab1a2d391a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 24 Mar 2023 11:45:28 +1100 Subject: [PATCH] test-registry: split docker and container paths 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 --- test-playbooks/registry/test-registry.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test-playbooks/registry/test-registry.yaml b/test-playbooks/registry/test-registry.yaml index e678e40e3..fca0db385 100644 --- a/test-playbooks/registry/test-registry.yaml +++ b/test-playbooks/registry/test-registry.yaml @@ -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