containers : update test variable
Use the term "multiarch" consistently in here to make it a bit easier to follow. Change-Id: Ic80b39797c5885ec1d184f1ab5d03d858b83417f
This commit is contained in:
parent
e4ac244bd8
commit
75c0f2ebaa
@ -1,6 +1,6 @@
|
|||||||
- hosts: all
|
- hosts: all
|
||||||
vars:
|
vars:
|
||||||
_arch_docker_images:
|
_multiarch_docker_images:
|
||||||
- context: test-playbooks/container/docker
|
- context: test-playbooks/container/docker
|
||||||
repository: "testrepo"
|
repository: "testrepo"
|
||||||
# This is what the Zuul repo uses to tag its releases:
|
# This is what the Zuul repo uses to tag its releases:
|
||||||
@ -11,7 +11,7 @@
|
|||||||
repository: "testrepo"
|
repository: "testrepo"
|
||||||
# This is what the Zuul repo uses to tag its releases:
|
# 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']) }}"
|
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
|
- context: test-playbooks/container/docker
|
||||||
registry: 127.0.0.1:5200
|
registry: 127.0.0.1:5200
|
||||||
repository: 127.0.0.1:5200/testrepo
|
repository: 127.0.0.1:5200/testrepo
|
||||||
@ -28,12 +28,12 @@
|
|||||||
- name: Set docker_images variable
|
- name: Set docker_images variable
|
||||||
when: "roleset == 'docker'"
|
when: "roleset == 'docker'"
|
||||||
set_fact:
|
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
|
- name: Set container_images variable
|
||||||
when: "roleset == 'container'"
|
when: "roleset == 'container'"
|
||||||
set_fact:
|
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
|
- name: Save zuul variables
|
||||||
set_fact:
|
set_fact:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user