Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Switch OSBS Prod to osbs-cluster

Browse source 
- remove osbs-master and osbs-node playbooks
    - add osbs production hosts to osbs-cluster playbook
    - migrate osbs production buildroot Dockerfile to j2 template
      (like we have in staging)
    - add infrastructure repo to buildroot dir and Dockerfile

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-12-07 04:03:26 +00:00
parent e5d7bc82b6
commit 2d3951e5b0
6 changed files with 85 additions and 865 deletions
Download patch file Download diff file Expand all files Collapse all files

7
files/osbs/buildroot-Dockerfile-production
View file

@ -1,7 +0,0 @@
FROM fedora:latest
RUN dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash
ADD ./atomic-reactor.tar.gz /tmp/
RUN cd /tmp/atomic-reactor-*/ && python setup.py install
ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt
RUN update-ca-trust
CMD ["atomic-reactor", "--verbose", "inside-build"]

9
files/osbs/buildroot-Dockerfile-production.j2 Normal file
View file

@ -0,0 +1,9 @@
FROM fedora:latest
ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.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/
ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt
RUN update-ca-trust
CMD ["python2", "/usr/bin/atomic-reactor", "--verbose", "inside-build"]

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

@ -1,4 +1,5 @@
FROM fedora:latest
ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.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