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

Testing Bodhi on staging before 5.7.4 release.

Browse source
This commit is contained in:
Adam Saleh 2022-01-24 15:06:27 +01:00
parent 612af5e20c
commit 3e61b53ce1
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/openshift-apps/bodhi/templates/buildconfig.yml
View file

@ -11,7 +11,11 @@ items:
runPolicy: Serial
source:
dockerfile: |-
{% if env == "staging" %}
{{ load_file('dockerfile-base-hotfix') | indent(8) }}
{% else %}
{{ load_file('dockerfile-base') | indent(8) }}
{% endif %}
type: Dockerfile
strategy:
type: Docker

6
roles/openshift-apps/bodhi/templates/dockerfile-base-hotfix
View file

@ -1,7 +1,7 @@
FROM fedora:34
MAINTAINER asaleh@redhat.com
ENV VERSION=5.7.2
ENV COMMIT=b758a4caeeeff639edb51e4e6ee8b634c4dce930
ENV VERSION=5.7.3
ENV COMMIT=f20a3f86034670033aa5b6ce65229201b779ba4d
ENV SPECURL=https://gist.githubusercontent.com/AdamSaleh/1919b8ec41075e415613e033086a6054/raw/4795a74b9cff10e401119a4e74b1085498ad7d91/bodhi.spec
RUN dnf -y install fedora-packager wget curl
RUN yum -y install rpm-build redhat-rpm-config make gcc git vi tar unzip rpmlint && yum clean all
@ -39,4 +39,4 @@ RUN dnf install -y /tmp/RPMS/noarch/* python3-pyramid_sawing python3-gunicorn
RUN rm -f /etc/krb5.conf && \
ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \
ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi{{ env_suffix }}.fedoraproject.org.keytab
ENV USER=openshift
ENV USER=openshift