From 8338a939b90d6d1719b5f46c62ffc2d90dea5937 Mon Sep 17 00:00:00 2001 From: Quique Llorente Date: Wed, 24 Oct 2018 17:49:06 +0200 Subject: [PATCH] Use container_build_id for standalone containers The container_build_id is set by the container-prep role with multiple fallbacks, we have to use the same value for the standalone-container-prep.sh tag value Story: https://tree.taiga.io/project/tripleo-ci-board/task/251?kanban-status=1447276 Change-Id: I908d5d8d218e49f3ae3c2d4cf89295ce2d260004 --- roles/standalone/templates/standalone-container-prep.sh.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/standalone/templates/standalone-container-prep.sh.j2 b/roles/standalone/templates/standalone-container-prep.sh.j2 index b28eb8407..48445d200 100644 --- a/roles/standalone/templates/standalone-container-prep.sh.j2 +++ b/roles/standalone/templates/standalone-container-prep.sh.j2 @@ -7,8 +7,8 @@ openstack tripleo container image prepare default \ sed -Ei 's/^([\t ]+)namespace: [a-z./]*/\1namespace: docker.io\/{{ docker_registry_namespace }}/' \ "{{ working_dir }}/containers-prepare-parameters.yaml" {% endif %} -{% if dlrn_hash_tag != '' %} +{% if container_build_id != '' %} # Make CI specific tag change to the container params -sed -Ei 's/^([\t ]+)tag: [a-z-]+/\1tag: {{ dlrn_hash_tag }}/' \ +sed -Ei 's/^([\t ]+)tag: [a-z-]+/\1tag: {{ container_build_id }}/' \ "{{ working_dir }}/containers-prepare-parameters.yaml" {% endif %}