Remove retag tripleo-ci-testing for periodic containers build job

As described in the bug the retag added at [1] isn't working.

However we are correctly pushing with the tripleo-ci-testing delorean
repo hash and that should be sufficient for the periodic jobs that
consume containers built by this job.

This removes the retag logic altogether and also removes the
push_tag variable. A related review in [2] also removes it in the
periodic jobs that were using this variable (no one else does/was)

Related-Bug: 1819583
[1] https://review.openstack.org/641348
[2] https://review.rdoproject.org/r/19484
Change-Id: I42f8e05bf1e5be230acdb7be16b056c8aff117f2
This commit is contained in:
Marios Andreou 2019-03-19 18:57:08 +02:00
parent dd0415df01
commit d44b16a12e
3 changed files with 0 additions and 31 deletions

View File

@ -1,5 +1,4 @@
push_registry: "127.0.0.1:8787"
push_tag: "latest"
push_containers: "false"
use_buildah: false
buildcontainers_override_repos: ""

View File

@ -9,7 +9,6 @@
set_fact:
ci_branch: "{{ zuul.branch | default('master') | replace('stable/','') }}"
push_registry: "{{ push_registry | default('127.0.0.1:8787') }}"
push_tag: "{{ push_tag | default('latest') }}"
push_containers: "{{ push_containers | default(false) | bool }}"
- name: Get contents of delorean repo baseurl for the version hash
@ -74,21 +73,3 @@
chdir: '{{ workspace }}'
shell: set -o pipefail && bash build_containers.sh 2>&1 {{ timestamper_cmd }} > {{ workspace }}/build.log
- name: Retrieve the images by version_hash and retag with tripleo-ci-testing if periodic
when:
- zuul is defined
- "'periodic' in zuul.pipeline"
block:
- name: Retrieve list of built images
shell: >
docker images --format "{{ '{{' }}.Repository{{ '}}' }}" \
--filter "reference=*:{{ version_hash }}"
register: built_images
- name: Tag images
vars:
image: "{{ item }}"
include: tag.yml
static: no
with_items: "{{ built_images.stdout_lines }}"

View File

@ -1,11 +0,0 @@
---
- block:
# Tag and push in the same task for the sake of doing less tasks
- name: "Tag image: {{ image }}"
command: >
{{ cmd }}
with_items:
- "docker tag {{ image }}:{{ version_hash }} {{ image }}:{{ push_tag }}"
- "docker push {{ image }}:{{ push_tag }}"
loop_control:
loop_var: "cmd"