From dac40b7b87cffbee488e8d65fbf6510cac19d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
Date: Mon, 21 Feb 2022 11:11:15 +0100
Subject: [PATCH] Blockerbugs: add bz_api_key

---
 inventory/group_vars/blockerbugs                       |  3 ++-
 inventory/group_vars/blockerbugs_stg                   |  3 ++-
 .../blockerbugs/templates/buildconfig.yml              |  2 +-
 roles/openshift-apps/blockerbugs/templates/cron.yml    | 10 +---------
 .../blockerbugs/templates/deploymentconfig.yml         | 10 +---------
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/inventory/group_vars/blockerbugs b/inventory/group_vars/blockerbugs
index 88682c43b3..796b29a2d7 100644
--- a/inventory/group_vars/blockerbugs
+++ b/inventory/group_vars/blockerbugs
@@ -1,6 +1,7 @@
 ---
 blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/'
-blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/'
+blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com'
+blockerbugs_bz_api_key: "{{ prod_blockerbugs_bz_api_key }}"
 blockerbugs_db_host: "{{ blockerbugs_db_host_machine }}"
 ############################################################
 # blockerbugs db details
diff --git a/inventory/group_vars/blockerbugs_stg b/inventory/group_vars/blockerbugs_stg
index eba12a41f7..b35bd47617 100644
--- a/inventory/group_vars/blockerbugs_stg
+++ b/inventory/group_vars/blockerbugs_stg
@@ -1,6 +1,7 @@
 ---
 blockerbugs_bodhi_url: 'https://bodhi.stg.fedoraproject.org/'
-blockerbugs_bugzilla_url: 'https://bugzilla.stage.redhat.com/'
+blockerbugs_bugzilla_url: 'https://bugzilla.stage.redhat.com'
+blockerbugs_bz_api_key: "{{ stg_blockerbugs_bz_api_key }}"
 blockerbugs_db_host: "{{ blockerbugs_db_host_machine }}"
 ############################################################
 # blockerbugs db details
diff --git a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
index b6395a5476..6aef01673a 100644
--- a/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
+++ b/roles/openshift-apps/blockerbugs/templates/buildconfig.yml
@@ -17,7 +17,7 @@ spec:
 {% if env == 'staging' %}
       ref: "develop"
 {% else %}
-      ref: "prod"
+      ref: "master"
 {% endif %}
   strategy:
     type: Source
diff --git a/roles/openshift-apps/blockerbugs/templates/cron.yml b/roles/openshift-apps/blockerbugs/templates/cron.yml
index c1bb32fcc3..f3d2600230 100644
--- a/roles/openshift-apps/blockerbugs/templates/cron.yml
+++ b/roles/openshift-apps/blockerbugs/templates/cron.yml
@@ -37,10 +37,6 @@ spec:
               value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/api/v0/"
             - name: FAS_BASE_URL
               value: "https://admin{{ env_suffix }}.fedoraproject.org/accounts/"
-            - name: FAS_PASSWORD
-              value: "{{ blockerbugs_fas_password }}"
-            - name: FAS_USER
-              value: "{{ blockerbugs_fas_user }}@fedoraproject.org"
             - name: FAS_ADMIN_GROUP
               value: "qa-admin"
             - name: PAGURE_BOT_USERNAME
@@ -59,12 +55,8 @@ spec:
               value: "{{ blockerbugs_pagure_url }}api/0/"
             - name: BUGZILLA_URL
               value: "{{ blockerbugs_bugzilla_url }}"
-            - name: BUGZILLA_XMLRPC
-              value: "{{ blockerbugs_bugzilla_url }}xmlrpc.cgi"
-{% if env == 'staging' %}
             - name: BUGZILLA_API_KEY
-              value: "{{ stg_blockerbugs_bz_api_key }}"
-{% endif %}
+              value: "{{ blockerbugs_bz_api_key }}"
             - name: BODHI_URL
               value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
             - name: OPENSHIFT_PROD
diff --git a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
index 5e2eb5d32a..c96fa656fd 100644
--- a/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/blockerbugs/templates/deploymentconfig.yml
@@ -55,10 +55,6 @@ spec:
           value: "https://qa{{ env_suffix }}.fedoraproject.org/blockerbugs/api/v0/"
         - name: FAS_BASE_URL
           value: "https://admin{{ env_suffix }}.fedoraproject.org/accounts/"
-        - name: FAS_PASSWORD
-          value: "{{ blockerbugs_fas_password }}"
-        - name: FAS_USER
-          value: "{{ blockerbugs_fas_user }}@fedoraproject.org"
         - name: FAS_ADMIN_GROUP
           value: "qa-admin"
         - name: PAGURE_BOT_USERNAME
@@ -77,12 +73,8 @@ spec:
           value: "{{ blockerbugs_pagure_url }}api/0/"
         - name: BUGZILLA_URL
           value: "{{ blockerbugs_bugzilla_url }}"
-        - name: BUGZILLA_XMLRPC
-          value: "{{ blockerbugs_bugzilla_url }}xmlrpc.cgi"
-{% if env == 'staging' %}
         - name: BUGZILLA_API_KEY
-          value: "{{ stg_blockerbugs_bz_api_key }}"
-{% endif %}
+          value: "{{ blockerbugs_bz_api_key }}"
         - name: BODHI_URL
           value: "https://bodhi{{ env_suffix }}.fedoraproject.org/"
         - name: OPENSHIFT_PROD