osbs-master playbook cleanup for changed_when coverage

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-07-27 15:31:45 +00:00
parent baeea2dff9
commit 6c91f62583

View file

@ -269,16 +269,20 @@
shell: "docker pull {{item}}"
with_items: "{{fedora_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
register: docker_pull_fedora_delegated
changed_when: "'Downloaded newer image' in docker_pull_fedora_delegated.stdout"
- name: tag fedora required docker images for our registry
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"
- 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"
- name: register origin_version_out rpm query
shell: "rpm -q origin --qf '%{Version}'"
@ -293,16 +297,20 @@
shell: "docker pull {{item}}:v{{origin_version}}"
with_items: "{{openshift_required_images}}"
delegate_to: compose-x86-01.phx2.fedoraproject.org
register: docker_pull_openshift_delegated
changed_when: "'Downloaded newer image' in docker_pull_openshift_delegated.stdout"
- name: tag openshift required docker images for our registry
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"
- 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"
- name: Ensure koji dockerbuilder cert path exists
file:
@ -329,15 +337,21 @@
creates: /etc/origin/fedoraimagestreamcreated
- name: set policy for koji builder in openshift for osbs
shell: "oadm policy add-role-to-user -n default edit htpasswd_provider: {{ osbs_koji_stg_username }}"
shell: "oadm policy add-role-to-user -n default edit htpasswd_provider: {{ osbs_koji_stg_username }} && touch /etc/origin/koji-builder-policy-added"
args:
creates: "/etc/origin/koji-builder-policy-added"
when: env == "staging"
- name: set policy for koji builder in openshift for osbs
shell: "oadm policy add-role-to-user -n default edit htpasswd_provider: {{ osbs_koji_prod_username }}"
shell: "oadm policy add-role-to-user -n default edit htpasswd_provider: {{ osbs_koji_prod_username }} && touch /etc/origin/koji-builder-policy-added"
args:
creates: "/etc/origin/koji-builder-policy-added"
when: env == "production"
- name: set policy for koji builder in openshift for atomic-reactor
shell: "oadm policy add-role-to-user -n default edit system:serviceaccount:default:builder"
shell: "oadm policy add-role-to-user -n default edit system:serviceaccount:default:builder && touch /etc/origin/atomic-reactor-policy-added"
args:
creates: "/etc/origin/atomic-reactor-policy-added"
- name: Create buildroot container conf directory
file:
@ -369,14 +383,20 @@
- name: pull fedora required docker images
shell: "docker pull {{docker_registry}}/{{item}}"
with_items: "{{fedora_required_images}}"
register: docker_pull_fedora
changed_when: "'Downloaded newer image' in docker_pull_fedora.stdout"
- name: pull openshift required docker images
shell: "docker pull {{docker_registry}}/{{item}}:v{{origin_version}}"
with_items: "{{openshift_required_images}}"
register: docker_pull_openshift
changed_when: "'Downloaded newer image' in docker_pull_openshift.stdout"
- 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"
- name: refresh fedora image streams
shell: "oc import-image fedora --all"
when: "'Downloaded newer image' in docker_pull_fedora.stdout"