From 2c6959f25b321496ee606fab4f6a43157eb21035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Mon, 26 Sep 2022 19:08:26 +0200 Subject: [PATCH] [release-monitoring] Use the correct location for quick fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Poetry is installing wheels when available. Let's change the egg paths to standard paths for staging. Signed-off-by: Michal Konečný --- .../release-monitoring/templates/buildconfig.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index 9d3f9c7ad7..7fca41c68e 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -76,12 +76,16 @@ items: rm -rf anitya # Let's use staging auth server in staging {% if env == 'staging' %} - RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_auth_core-4.3.0-py3.10.egg/social_core/backends/fedora.py + RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py {% endif %} # Hotfix for social_auth-sqlalchemy # Could be removed when we switch to something else +{% if env == 'staging' %} + RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.10/site-packages/social_sqlalchemy/storage.py +{% else %} RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.10/site-packages/social_auth_storage_sqlalchemy-1.1.0-py3.10.egg/social_sqlalchemy/storage.py +{% endif %} RUN mkdir /httpdir RUN chmod 777 /httpdir EXPOSE 8080