From 8a5411535face1a5e3cb9f11d70e6c5074b08bee Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 14 Apr 2016 16:03:02 +0000 Subject: [PATCH] refactor how osbs copr repos are handled for stage Signed-off-by: Adam Miller --- files/osbs/maxamillion-atomic-reactor-epel.repo | 8 ++++++++ files/osbs/maxamillion-atomic-reactor-fedora.repo | 8 ++++++++ playbooks/groups/buildvm.yml | 1 + playbooks/groups/koji-hub.yml | 1 + playbooks/groups/osbs-master.yml | 2 ++ roles/osbs-atomic-reactor/tasks/source_rpm.yml | 12 ------------ tasks/osbs_repos.yml | 13 +++++++++++++ 7 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 files/osbs/maxamillion-atomic-reactor-epel.repo create mode 100644 files/osbs/maxamillion-atomic-reactor-fedora.repo create mode 100644 tasks/osbs_repos.yml diff --git a/files/osbs/maxamillion-atomic-reactor-epel.repo b/files/osbs/maxamillion-atomic-reactor-epel.repo new file mode 100644 index 0000000000..867bbeaa19 --- /dev/null +++ b/files/osbs/maxamillion-atomic-reactor-epel.repo @@ -0,0 +1,8 @@ +[maxamillion-atomic-reactor] +name=Copr repo for atomic-reactor owned by maxamillion +baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/atomic-reactor/epel-7-$basearch/ +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/atomic-reactor/pubkey.gpg +enabled=1 +enabled_metadata=1 \ No newline at end of file diff --git a/files/osbs/maxamillion-atomic-reactor-fedora.repo b/files/osbs/maxamillion-atomic-reactor-fedora.repo new file mode 100644 index 0000000000..6879f370a7 --- /dev/null +++ b/files/osbs/maxamillion-atomic-reactor-fedora.repo @@ -0,0 +1,8 @@ +[maxamillion-atomic-reactor] +name=Copr repo for atomic-reactor owned by maxamillion +baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/atomic-reactor/fedora-$releasever-$basearch/ +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/atomic-reactor/pubkey.gpg +enabled=1 +enabled_metadata=1 \ No newline at end of file diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 432e13e099..aeb090bfe1 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -18,6 +18,7 @@ pre_tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/osbs_certs.yml" + - include: "{{ tasks }}/osbs_repos.yml" roles: - base diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 21a5800701..51703d8456 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -18,6 +18,7 @@ pre_tasks: - include: "{{ tasks }}/osbs_certs.yml" + - include: "{{ tasks }}/osbs_repos.yml" roles: - base diff --git a/playbooks/groups/osbs-master.yml b/playbooks/groups/osbs-master.yml index 2ee30c6ca4..5abb9fb7d5 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -38,6 +38,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: + - include: "{{tasks}}/osbs_repos.yml" + - name: create cert dir for openshift public facing REST API SSL file: path: "/etc/origin/master/named_certificates" diff --git a/roles/osbs-atomic-reactor/tasks/source_rpm.yml b/roles/osbs-atomic-reactor/tasks/source_rpm.yml index 5e734ce31c..a1df368a14 100644 --- a/roles/osbs-atomic-reactor/tasks/source_rpm.yml +++ b/roles/osbs-atomic-reactor/tasks/source_rpm.yml @@ -1,16 +1,4 @@ --- -- name: setup COPR repository for atomic-reactor builds - copy: - src: maxamillion-atomic-reactor-fedora.repo - dest: /etc/yum.repos.d/maxamillion-atomic-reactor-fedora.repo - when: (atomic_reactor_rpm.copr == True) and (is_fedora is defined) - -- name: setup COPR repository for atomic-reactor builds - copy: - src: maxamillion-atomic-reactor-epel.repo - dest: /etc/yum.repos.d/maxamillion-atomic-reactor-epel.repo - when: (atomic_reactor_rpm.copr == True) and (is_rhel is defined) - - name: install atomic-reactor package locally action: "{{ ansible_pkg_mgr }} name=atomic-reactor state=latest" notify: diff --git a/tasks/osbs_repos.yml b/tasks/osbs_repos.yml new file mode 100644 index 0000000000..027b788a6e --- /dev/null +++ b/tasks/osbs_repos.yml @@ -0,0 +1,13 @@ +--- + +- name: install the atomic-reactor copr repo (fedora) + copy: + src: "{{files}}/osbs/maxamillion-atomic-reactor-fedora.repo" + dest: "/etc/yum.repos.d/maxamillion-atomic-reactor-fedora.repo" + when: env == "staging" and is_fedora is defined + +- name: install the atomic-reactor copr repo (epel) + copy: + src: "{{files}}/osbs/maxamillion-atomic-reactor-epel.repo" + dest: "/etc/yum.repos.d/maxamillion-atomic-reactor-epel.repo" + when: env == "staging" and is_rhel is defined