From ce61b702b4329820de3c725316a88ffd96cdf294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Tue, 27 Sep 2022 15:50:02 +0200 Subject: [PATCH] [release-monitoring] Fix the remaining deployment issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found out the issue was in missing includes in pyproject.toml. This is fixed in https://github.com/fedora-infra/anitya/pull/1486 and the build should work again. Let's hope I'm right. Signed-off-by: Michal Konečný --- .../templates/buildconfig.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml index ff4239476c..04c4ff6430 100644 --- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml @@ -55,9 +55,8 @@ items: pushd anitya && \ {% if env == 'staging' %} git checkout staging && \ - python3 -m venv --system-site-packages .venv && \ - source .venv/bin/activate && \ - pip-3 install . && \ + poetry build && \ + pip-3 install dist/*.whl && \ {% else %} git checkout production && \ python3 setup.py install && \ @@ -70,14 +69,16 @@ items: cp -r _build/html/* ../anitya/static/docs/ && \ popd && \ {% if env == 'staging' %} - deactivate && \ + poetry build && \ + pip-3 install dist/*.whl && \ + # Copy the symlink, it's not part of wheel + cp static/bootstrap /usr/local/lib/python3.10/site-packages/anitya/static/ {% else %} python3 setup.py install && \ -{% endif %} pip-3 install . && \ - popd - # popd && \ - # rm -rf anitya +{% endif %} + popd && \ + rm -rf anitya {% if env == 'staging' %} # Let's use staging auth server in staging RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py