From 774df9e834b486d30f4d3f036ba2fbe30cc2c5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Wed, 9 Jan 2019 15:32:18 +0100
Subject: [PATCH] anitya/release-monitoring: Fix crashing build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I did some changes in buildconfig previously, but it turned out that this
was causing the build to fail. So I removing the changes in buildconfig.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 .../templates/buildconfig.yml                 | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
index 64ac6c57a1..72d3aa5fef 100644
--- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
+++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
@@ -42,27 +42,27 @@ items:
             dnf autoremove -y && \
             dnf clean all -y
         RUN pip-3 install sqlalchemy_schemadisplay
-        RUN git clone https://github.com/release-monitoring/anitya.git
-        RUN pushd anitya
+        RUN git clone https://github.com/release-monitoring/anitya.git && \
+                pushd anitya && \
 {% if env == 'staging' %}
-        RUN git checkout staging
+                git checkout staging && \
 {% else %}
-        RUN git checkout production
+                git checkout production && \
 {% endif %}
-        RUN python3 setup.py install
-        RUN pushd docs
-        RUN mkdir -p images
-        RUN python3 generate_db_schema
-        RUN sphinx-build-3 -b html . _build/html
-        RUN mkdir -p ../anitya/static/docs/
-        RUN cp -r _build/html/* ../anitya/static/docs/
-        RUN popd
-        RUN python3 setup.py install
-        RUN rm -f /usr/local/bin/anitya_cron.py
-        RUN cp files/anitya_cron.py /usr/local/bin/
-        RUN pip-3 install .
-        RUN popd
-        RUN rm -rf anitya
+                python3 setup.py install && \
+                pushd docs && \
+                mkdir -p images && \
+                python3 generate_db_schema && \
+                sphinx-build-3 -b html . _build/html && \
+                mkdir -p ../anitya/static/docs/ && \
+                cp -r _build/html/* ../anitya/static/docs/ && \
+                popd && \
+                python3 setup.py install && \
+                rm -f /usr/local/bin/anitya_cron.py && \
+                cp files/anitya_cron.py /usr/local/bin/ && \
+                pip-3 install . && \
+                popd && \
+                rm -rf anitya
         RUN rm /etc/fedmsg.d/*py
         RUN mkdir /httpdir
         RUN chmod 777 /httpdir