From 63f04629f6a6dc88c6001151635e74e5461698c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 2 Feb 2021 12:33:10 +0100 Subject: [PATCH] oraculum: Final tweaks --- .../oraculum/templates/buildconfig.yml | 2 +- .../oraculum/templates/deploymentconfig.yml | 40 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/roles/openshift-apps/oraculum/templates/buildconfig.yml b/roles/openshift-apps/oraculum/templates/buildconfig.yml index 687c0a05a1..87f5fb17a9 100644 --- a/roles/openshift-apps/oraculum/templates/buildconfig.yml +++ b/roles/openshift-apps/oraculum/templates/buildconfig.yml @@ -14,7 +14,7 @@ spec: type: Git git: uri: https://pagure.io/fedora-qa/oraculum - ref: "python36" + ref: "master" strategy: type: Source sourceStrategy: diff --git a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml index f839564f6c..1743d69daf 100644 --- a/roles/openshift-apps/oraculum/templates/deploymentconfig.yml +++ b/roles/openshift-apps/oraculum/templates/deploymentconfig.yml @@ -66,11 +66,15 @@ spec: {% endif %} # WatchDog emails - name: SEND_ERROR_EMAILS - value: "false" + value: "true" - name: ADMIN_EMAILS - value: "fzatlouk@redhat.com" + value: "['fzatlouk@redhat.com']" - name: SMTP_CONFIG - value: "{{ oraculum_smtp_confline }}" +{% if env == 'staging' %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.stg.fedoraproject.org;" +{% else %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.fedoraproject.org;" +{% endif %} volumeMounts: - name: oraculum-secret-volume mountPath: /opt/app-root/secret/ @@ -159,11 +163,15 @@ spec: {% endif %} # WatchDog emails - name: SEND_ERROR_EMAILS - value: "false" + value: "true" - name: ADMIN_EMAILS - value: "fzatlouk@redhat.com" + value: "['fzatlouk@redhat.com']" - name: SMTP_CONFIG - value: "{{ oraculum_smtp_confline }}" +{% if env == 'staging' %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.stg.fedoraproject.org;" +{% else %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.fedoraproject.org;" +{% endif %} volumeMounts: - name: oraculum-secret-volume mountPath: /opt/app-root/secret/ @@ -236,11 +244,15 @@ spec: {% endif %} # WatchDog emails - name: SEND_ERROR_EMAILS - value: "false" + value: "true" - name: ADMIN_EMAILS - value: "fzatlouk@redhat.com" + value: "['fzatlouk@redhat.com']" - name: SMTP_CONFIG - value: "{{ oraculum_smtp_confline }}" +{% if env == 'staging' %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.stg.fedoraproject.org;" +{% else %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.fedoraproject.org;" +{% endif %} volumeMounts: - name: oraculum-secret-volume mountPath: /opt/app-root/secret/ @@ -315,11 +327,15 @@ spec: {% endif %} # WatchDog emails - name: SEND_ERROR_EMAILS - value: "false" + value: "true" - name: ADMIN_EMAILS - value: "fzatlouk@redhat.com" + value: "['fzatlouk@redhat.com']" - name: SMTP_CONFIG - value: "{{ oraculum_smtp_confline }}" +{% if env == 'staging' %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.stg.fedoraproject.org;" +{% else %} + value: "bastion.iad2.fedoraproject.org;;;watchdog@packager-dashboard.fedoraproject.org;" +{% endif %} volumeMounts: - name: oraculum-secret-volume mountPath: /opt/app-root/secret/