diff --git a/playbooks/tripleo-buildcontainers/defaults/main.yaml b/playbooks/tripleo-buildcontainers/defaults/main.yaml index 3eeb01fd5..afca7704a 100644 --- a/playbooks/tripleo-buildcontainers/defaults/main.yaml +++ b/playbooks/tripleo-buildcontainers/defaults/main.yaml @@ -1,5 +1,4 @@ push_registry: "127.0.0.1:8787" -push_tag: "latest" push_containers: "false" use_buildah: false buildcontainers_override_repos: "" diff --git a/playbooks/tripleo-buildcontainers/run.yaml b/playbooks/tripleo-buildcontainers/run.yaml index a242e0090..93f120478 100644 --- a/playbooks/tripleo-buildcontainers/run.yaml +++ b/playbooks/tripleo-buildcontainers/run.yaml @@ -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 }}" - diff --git a/playbooks/tripleo-buildcontainers/tag.yaml b/playbooks/tripleo-buildcontainers/tag.yaml deleted file mode 100644 index 2b339f8ff..000000000 --- a/playbooks/tripleo-buildcontainers/tag.yaml +++ /dev/null @@ -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"