diff options
| author | Adam Miller <admiller@redhat.com> | 2016-12-08 19:59:49 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2016-12-08 19:59:54 +0000 |
| commit | 49655eec73f1bdaf8d2bd11d0d714e76314e277a (patch) | |
| tree | cc00ba3aadce18f378d413bf2e77f0fa126877c9 | |
| parent | 3c20df3b47eaf24acca0d853b7769ab4985d7cd0 (diff) | |
| download | ansible-49655eec73f1bdaf8d2bd11d0d714e76314e277a.tar.gz ansible-49655eec73f1bdaf8d2bd11d0d714e76314e277a.tar.xz ansible-49655eec73f1bdaf8d2bd11d0d714e76314e277a.zip | |
switch infrastructure.repo to infra-tags.repo for OSBS buildroot
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | files/osbs/buildroot-Dockerfile-production.j2 | 2 | ||||
| -rw-r--r-- | files/osbs/buildroot-Dockerfile-staging.j2 | 2 | ||||
| -rw-r--r-- | playbooks/groups/osbs-cluster.yml | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/files/osbs/buildroot-Dockerfile-production.j2 b/files/osbs/buildroot-Dockerfile-production.j2 index dc047fa18..fcc55681e 100644 --- a/files/osbs/buildroot-Dockerfile-production.j2 +++ b/files/osbs/buildroot-Dockerfile-production.j2 @@ -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/ diff --git a/files/osbs/buildroot-Dockerfile-staging.j2 b/files/osbs/buildroot-Dockerfile-staging.j2 index 5b69d5a99..17c15735c 100644 --- a/files/osbs/buildroot-Dockerfile-staging.j2 +++ b/files/osbs/buildroot-Dockerfile-staging.j2 @@ -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 diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 65105820b..f30508684 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -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 |