diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index 3c9988fb67..e6738a25d5 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -191,38 +191,6 @@ when: env == "production" } -- name: pre-stage content in our docker registry - hosts: compose-x86-01.phx2.fedoraproject.org - user: root - gather_facts: True - tags: - - releng-compose - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - /srv/private/ansible/vars.yml - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - - name: register origin_version_out rpm query - shell: "rpm -q origin --qf '%{Version}'" - register: origin_version_out - - - set_fact: - origin_version: "{{origin_version_out.stdout}}" - - - name: pull openshift required docker images - shell: "docker pull {{item}}:v{{origin_version}}" - with_items: "{{openshift_required_images}}" - - - 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}}" - - - name: push openshift required docker images to our registry - shell: "docker push {{docker_registry}}/{{item}}:v{{origin_version}}" - with_items: "{{openshift_required_images}}" - - name: post-install osbs tasks hosts: osbs:osbs-stg vars_files: @@ -256,6 +224,29 @@ tasks: + + - name: register origin_version_out rpm query + shell: "rpm -q origin --qf '%{Version}'" + register: origin_version_out + + - set_fact: + origin_version: "{{origin_version_out.stdout}}" + + - name: pull openshift required docker images + shell: "docker pull {{item}}:v{{origin_version}}" + with_items: "{{openshift_required_images}}" + delegate_to: compose-x86-01.phx2.fedoraproject.org + + - 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 + + - 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 + - name: Ensure koji dockerbuilder cert path exists file: path: "{{ koji_pki_dir }}"