From 6f3b49e5f50867cc932bd3cebb568cbe8d47c112 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 27 Jul 2016 15:51:08 +0000 Subject: [PATCH] switch some osbs-master playbook tasks to use jinja filters for when: conditional Signed-off-by: Adam Miller --- playbooks/groups/osbs-master.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index b01b99e961..f7826feea7 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -276,13 +276,13 @@ shell: "docker tag {{item}} {{docker_registry}}/{{item}}" with_items: "{{fedora_required_images}}" delegate_to: compose-x86-01.phx2.fedoraproject.org - when: "'Downloaded newer image' in docker_pull_fedora_delegated.stdout" + when: docker_pull_fedora_delegated|changed - name: push fedora required docker images to our registry shell: "docker push {{docker_registry}}/{{item}}" with_items: "{{fedora_required_images}}" delegate_to: compose-x86-01.phx2.fedoraproject.org - when: "'Downloaded newer image' in docker_pull_fedora_delegated.stdout" + when: docker_pull_fedora_delegated|changed - name: register origin_version_out rpm query shell: "rpm -q origin --qf '%{Version}'" @@ -304,13 +304,13 @@ shell: "docker tag {{item}}:v{{origin_version}} {{docker_registry}}/{{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" delegate_to: compose-x86-01.phx2.fedoraproject.org - when: "'Downloaded newer image' in docker_pull_openshift_delegated.stdout" + when: docker_pull_openshift_delegated|changed - name: push openshift required docker images to our registry shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" delegate_to: compose-x86-01.phx2.fedoraproject.org - when: "'Downloaded newer image' in docker_pull_openshift_delegated.stdout" + when: docker_pull_openshift_delegated|changed - name: Ensure koji dockerbuilder cert path exists file: @@ -395,8 +395,8 @@ - name: tag openshift required docker images locally shell: "docker tag {{docker_registry}}/{{item}}:v{{origin_version}} {{item}}:v{{origin_version}}" with_items: "{{openshift_required_images}}" - when: "'Downloaded newer image' in docker_pull_openshift.stdout" + when: docker_pull_openshift|changed - name: refresh fedora image streams shell: "oc import-image fedora --all" - when: "'Downloaded newer image' in docker_pull_fedora.stdout" + when: docker_pull_fedora|changed