infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

switch infrastructure.repo to infra-tags.repo for OSBS buildroot

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-12-08 19:59:49 +00:00
parent 3c20df3b47
commit 49655eec73
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
files/osbs/buildroot-Dockerfile-production.j2
View file

@ -1,5 +1,5 @@
FROM fedora:24
ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.repo
ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo
RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor*
RUN sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf
ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/

2
files/osbs/buildroot-Dockerfile-staging.j2
View file

@ -1,5 +1,5 @@
FROM fedora:24
ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.repo
ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo
RUN curl -o /etc/yum.repos.d/maxamillion-atomic-reactor-copr.repo https://copr.fedorainfracloud.org/coprs/maxamillion/atomic-reactor/repo/fedora-24/maxamillion-atomic-reactor-fedora-24.repo
RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor*
RUN sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf

10
playbooks/groups/osbs-cluster.yml
View file

@ -625,24 +625,24 @@
- name: stat infra repofile
stat:
path: "/etc/yum.repos.d/infrastructure.repo"
path: "/etc/yum.repos.d/infra-tags.repo"
register: infra_repo_stat
- name: stat /etc/osbs/buildroot/ infra repofile
stat:
path: "/etc/osbs/buildroot/infrastructure.repo"
path: "/etc/osbs/buildroot/infra-tags.repo"
register: etcosbs_infra_repo_stat
- name: remove old /etc/osbs/buildroot/ infra repofile
file:
path: "/etc/osbs/buildroot/infrastructure.repo"
path: "/etc/osbs/buildroot/infra-tags.repo"
state: absent
when: etcosbs_infra_repo_stat.stat.exists and infra_repo_stat.stat.checksum != etcosbs_infra_repo_stat.stat.checksum
- name: Copy repofile for buildroot container (because Docker)
copy:
src: "/etc/yum.repos.d/infrastructure.repo"
dest: "/etc/osbs/buildroot/infrastructure.repo"
src: "/etc/yum.repos.d/infra-tags.repo"
dest: "/etc/osbs/buildroot/infra-tags.repo"
remote_src: true
notify:
- buildroot container