From 75c0f2ebaad416d67365ea2935afae7642d9a7c1 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 22 Mar 2023 09:20:39 +1100 Subject: [PATCH] containers : update test variable Use the term "multiarch" consistently in here to make it a bit easier to follow. Change-Id: Ic80b39797c5885ec1d184f1ab5d03d858b83417f --- test-playbooks/container/test-build-container-image.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test-playbooks/container/test-build-container-image.yaml b/test-playbooks/container/test-build-container-image.yaml index c23576f75..9f5fcf576 100644 --- a/test-playbooks/container/test-build-container-image.yaml +++ b/test-playbooks/container/test-build-container-image.yaml @@ -1,6 +1,6 @@ - hosts: all vars: - _arch_docker_images: + _multiarch_docker_images: - context: test-playbooks/container/docker repository: "testrepo" # This is what the Zuul repo uses to tag its releases: @@ -11,7 +11,7 @@ repository: "testrepo" # This is what the Zuul repo uses to tag its releases: tags: "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}" - _arch_container_images: + _multiarch_container_images: - context: test-playbooks/container/docker registry: 127.0.0.1:5200 repository: 127.0.0.1:5200/testrepo @@ -28,12 +28,12 @@ - name: Set docker_images variable when: "roleset == 'docker'" set_fact: - docker_images: "{{ multiarch | ternary(_arch_docker_images, _normal_docker_images) }}" + docker_images: "{{ multiarch | ternary(_multiarch_docker_images, _normal_docker_images) }}" - name: Set container_images variable when: "roleset == 'container'" set_fact: - container_images: "{{ multiarch | ternary(_arch_container_images, _normal_container_images) }}" + container_images: "{{ multiarch | ternary(_multiarch_container_images, _normal_container_images) }}" - name: Save zuul variables set_fact: