From 9571d5900911e94c7d6c225c4e56de1d8d88a614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Fri, 11 Feb 2022 00:24:39 +0100 Subject: [PATCH] Blockerbugs: fixup pagure url for prod --- roles/openshift-apps/blockerbugs/templates/buildconfig.yml | 5 ++++- roles/openshift-apps/blockerbugs/templates/cron.yml | 4 ++-- .../blockerbugs/templates/deploymentconfig.yml | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml index f573efb6bc..b6395a5476 100644 --- a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml +++ b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml @@ -14,8 +14,11 @@ spec: type: Git git: uri: https://pagure.io/fedora-qa/blockerbugs - # Change to develop/master once we iron things out! +{% if env == 'staging' %} ref: "develop" +{% else %} + ref: "prod" +{% endif %} strategy: type: Source sourceStrategy: diff --git a/roles/openshift-apps/blockerbugs/templates/cron.yml b/roles/openshift-apps/blockerbugs/templates/cron.yml index 1de36a25bb..59c5a6552d 100644 --- a/roles/openshift-apps/blockerbugs/templates/cron.yml +++ b/roles/openshift-apps/blockerbugs/templates/cron.yml @@ -54,9 +54,9 @@ spec: - name: PAGURE_REPO_WEBHOOK_KEY value: "{{ blockerbugs_pagure_repo_webhook_key_secret }}" - name: PAGURE_URL - value: "https://{{ env_short }}.pagure.io/" + value: "{{ blockerbugs_pagure_url }}" - name: PAGURE_API - value: "https://{{ env_short }}.pagure.io/api/0/" + value: "{{ blockerbugs_pagure_url }}api/0/" - name: BUGZILLA_URL value: "{{ blockerbugs_bugzilla_url }}" - name: BUGZILLA_XMLRPC diff --git a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml index acdc9becee..942b9ffcb1 100644 --- a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml +++ b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml @@ -72,9 +72,9 @@ spec: - name: PAGURE_REPO_WEBHOOK_KEY value: "{{ blockerbugs_pagure_repo_webhook_key_secret }}" - name: PAGURE_URL - value: "https://{{ env_short }}.pagure.io/" + value: "{{ blockerbugs_pagure_url }}" - name: PAGURE_API - value: "https://{{ env_short }}.pagure.io/api/0/" + value: "{{ blockerbugs_pagure_url }}api/0/" - name: BUGZILLA_URL value: "{{ blockerbugs_bugzilla_url }}" - name: BUGZILLA_XMLRPC