From 50c3916c8d858b58bd0917b4954aced54e192d36 Mon Sep 17 00:00:00 2001 From: Gabriele Cerami Date: Wed, 22 May 2019 10:35:29 +0100 Subject: [PATCH] standalone upgrade: use container_build_id as tag specifier container prep role server as a collection point to all the variables that specify a tag, and set the winner tag in container_build_id. Let's use that var instead to prepare the containers. Change-Id: Ia0e446c7e0ec91822e678362bb43f4abc988046f --- .../templates/standalone-container-prep.sh.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2 b/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2 index 34a977460..393224aef 100644 --- a/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2 +++ b/roles/standalone-upgrade/templates/standalone-container-prep.sh.j2 @@ -9,6 +9,6 @@ sed -Ei 's/^([\t ]+)namespace: [a-z./]*/\1namespace: {{ docker_registry_host }}\ {% endif %} {% if dlrn_hash_tag != '' %} # 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-upgrade.yaml" {% endif %}