refactor how osbs copr repos are handled for stage

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-04-14 16:03:02 +00:00
parent 1475f3b8f6
commit 8a5411535f
7 changed files with 33 additions and 12 deletions

View file

@ -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

View file

@ -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

View file

@ -18,6 +18,7 @@
pre_tasks:
- include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/osbs_certs.yml"
- include: "{{ tasks }}/osbs_repos.yml"
roles:
- base

View file

@ -18,6 +18,7 @@
pre_tasks:
- include: "{{ tasks }}/osbs_certs.yml"
- include: "{{ tasks }}/osbs_repos.yml"
roles:
- base

View file

@ -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"

View file

@ -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:

13
tasks/osbs_repos.yml Normal file
View file

@ -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