Merge "containers : update test variable"
This commit is contained in:
commit
73e145a493
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user