[release-monitoring] Prepare prod to 1.4.0
As a bonus move it to OCP4. Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
parent
227d2666ac
commit
61b3d053b1
3 changed files with 3 additions and 35 deletions
|
@ -1,7 +1,7 @@
|
||||||
# Deploy the app
|
# Deploy the app
|
||||||
|
|
||||||
- name: make the app be real
|
- name: make the app be real
|
||||||
hosts: os_control_stg[0]:os_masters[0]
|
hosts: os_control_stg[0]:os_control[0]
|
||||||
user: root
|
user: root
|
||||||
gather_facts: False
|
gather_facts: False
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
items:
|
items:
|
||||||
- apiVersion: v1
|
- apiVersion: v1
|
||||||
|
@ -10,11 +11,7 @@ items:
|
||||||
runPolicy: Serial
|
runPolicy: Serial
|
||||||
source:
|
source:
|
||||||
dockerfile: |-
|
dockerfile: |-
|
||||||
{% if env == 'staging' %}
|
|
||||||
FROM fedora:36
|
FROM fedora:36
|
||||||
{% else %}
|
|
||||||
FROM fedora:32
|
|
||||||
{% endif %}
|
|
||||||
LABEL \
|
LABEL \
|
||||||
name="release-monitoring-web" \
|
name="release-monitoring-web" \
|
||||||
vendor="Fedora Infrastructure" \
|
vendor="Fedora Infrastructure" \
|
||||||
|
@ -25,9 +22,7 @@ items:
|
||||||
graphviz \
|
graphviz \
|
||||||
fedora-messaging \
|
fedora-messaging \
|
||||||
python3-alembic \
|
python3-alembic \
|
||||||
{% if env == 'staging' %}
|
|
||||||
python3-beautifulsoup4 \
|
python3-beautifulsoup4 \
|
||||||
{% endif %}
|
|
||||||
python3-arrow \
|
python3-arrow \
|
||||||
python3-dateutil \
|
python3-dateutil \
|
||||||
python3-defusedxml \
|
python3-defusedxml \
|
||||||
|
@ -39,22 +34,13 @@ items:
|
||||||
python3-ordered-set \
|
python3-ordered-set \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
python3-psycopg2 \
|
python3-psycopg2 \
|
||||||
{% if env == 'staging' %}
|
|
||||||
python3-semver \
|
python3-semver \
|
||||||
{% else %}
|
|
||||||
python3-pytoml \
|
|
||||||
python3-semver \
|
|
||||||
python3-social-auth-app-flask \
|
|
||||||
python3-social-auth-app-flask-sqlalchemy \
|
|
||||||
{% endif %}
|
|
||||||
python3-sphinxcontrib-httpdomain \
|
python3-sphinxcontrib-httpdomain \
|
||||||
python3-sqlalchemy \
|
python3-sqlalchemy \
|
||||||
python3-sqlalchemy_schemadisplay \
|
python3-sqlalchemy_schemadisplay \
|
||||||
python3-sseclient \
|
python3-sseclient \
|
||||||
python3-straight-plugin \
|
python3-straight-plugin \
|
||||||
{% if env == 'staging' %}
|
|
||||||
python3-toml \
|
python3-toml \
|
||||||
{% endif %}
|
|
||||||
python3-wtforms && \
|
python3-wtforms && \
|
||||||
dnf autoremove -y && \
|
dnf autoremove -y && \
|
||||||
dnf clean all -y
|
dnf clean all -y
|
||||||
|
@ -75,21 +61,16 @@ items:
|
||||||
popd && \
|
popd && \
|
||||||
python3 setup.py install && \
|
python3 setup.py install && \
|
||||||
pip-3 install . && \
|
pip-3 install . && \
|
||||||
{% if env != 'staging' %}
|
|
||||||
pushd anitya_schema && \
|
|
||||||
pip-3 install . && \
|
|
||||||
popd && \
|
|
||||||
{% endif %}
|
|
||||||
popd && \
|
popd && \
|
||||||
rm -rf anitya
|
rm -rf anitya
|
||||||
# Let's use staging auth server in staging
|
# Let's use staging auth server in staging
|
||||||
{% if env == '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_auth_core-4.3.0-py3.10.egg/social_core/backends/fedora.py
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
# Hotfix for social_auth-sqlalchemy
|
# Hotfix for social_auth-sqlalchemy
|
||||||
# Could be removed when we switch to something else
|
# Could be removed when we switch to something 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
|
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 mkdir /httpdir
|
||||||
RUN chmod 777 /httpdir
|
RUN chmod 777 /httpdir
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
|
@ -27,19 +27,11 @@ StartServers 20
|
||||||
ServerLimit 100
|
ServerLimit 100
|
||||||
MaxRequestsPerChild 2000
|
MaxRequestsPerChild 2000
|
||||||
MaxRequestWorkers 100
|
MaxRequestWorkers 100
|
||||||
{% if env == 'staging' %}
|
|
||||||
<Directory "/usr/local/lib/python3.10/anitya/static/docs/html/">
|
<Directory "/usr/local/lib/python3.10/anitya/static/docs/html/">
|
||||||
{% else %}
|
|
||||||
<Directory "/usr/local/lib/python3.8/anitya/static/docs/html/">
|
|
||||||
{% endif %}
|
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
{% if env == 'staging' %}
|
|
||||||
<Directory "/usr/local/lib/python3.10/site-packages/anitya/static/">
|
<Directory "/usr/local/lib/python3.10/site-packages/anitya/static/">
|
||||||
{% else %}
|
|
||||||
<Directory "/usr/local/lib/python3.8/site-packages/anitya/static/">
|
|
||||||
{% endif %}
|
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Require all granted
|
Require all granted
|
||||||
</Directory>
|
</Directory>
|
||||||
|
@ -63,13 +55,8 @@ LogLevel info
|
||||||
TypesConfig /etc/mime.types
|
TypesConfig /etc/mime.types
|
||||||
AddDefaultCharset UTF-8
|
AddDefaultCharset UTF-8
|
||||||
CoreDumpDirectory /tmp
|
CoreDumpDirectory /tmp
|
||||||
{% if env == 'staging' %}
|
|
||||||
Alias /docs /usr/local/lib/python3.10/anitya/static/docs/html/
|
Alias /docs /usr/local/lib/python3.10/anitya/static/docs/html/
|
||||||
Alias /static /usr/local/lib/python3.10/site-packages/anitya/static/
|
Alias /static /usr/local/lib/python3.10/site-packages/anitya/static/
|
||||||
{% else %}
|
|
||||||
Alias /docs /usr/local/lib/python3.8/anitya/static/docs/html/
|
|
||||||
Alias /static /usr/local/lib/python3.8/site-packages/anitya/static/
|
|
||||||
{% endif %}
|
|
||||||
WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir
|
WSGIDaemonProcess anitya display-name=anitya processes=2 threads=2 maximum-requests=1000 home=/httpdir
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGISocketPrefix run/wsgi
|
WSGISocketPrefix run/wsgi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue