diff --git a/roles/openshift-apps/release-monitoring/files/buildconfig.yml b/roles/openshift-apps/release-monitoring/files/buildconfig.yml index 1bbff6e963..e77c6b90fc 100644 --- a/roles/openshift-apps/release-monitoring/files/buildconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/buildconfig.yml @@ -44,7 +44,11 @@ items: RUN pip-3 install sqlalchemy_schemadisplay RUN git clone https://github.com/release-monitoring/anitya.git && \ pushd anitya && \ - git checkout 0.14.0 && \ +{% if env == 'staging' %} + git checkout staging && \ +{% else %} + git checkout production && \ +{% endif %} python3 setup.py install && \ pushd docs && \ mkdir -p images && \ @@ -74,5 +78,15 @@ items: to: kind: ImageStreamTag name: release-monitoring-web:latest + triggers: +{% if stg_anitya_github_secret is defined and env == 'staging' %} + - type: GitHub + github: + secret: "{{ stg_anitya_github_secret }}" +{% if anitya_github_secret is defined and env == 'production' %} + - type: GitHub + github: + secret: "{{ anitya_github_secret }}" +{% endif %} kind: List metadata: {} diff --git a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml index b64e570ce2..19476e21ea 100644 --- a/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml +++ b/roles/openshift-apps/release-monitoring/files/deploymentconfig.yml @@ -23,19 +23,6 @@ items: volumes: - config-volume resources: {} - rollingParams: - intervalSeconds: 1 - maxSurge: 25% - maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 - pre: - failurePolicy: Abort - execNewPod: - containerName: release-monitoring-web - command: [ /bin/sh, -i, -c, "alembic-3 -c /etc/anitya/alembic.ini upgrade head" ] - volumes: - - config-volume type: Recreate template: metadata: