From 4dbe3c40db03c31994136b232c8f50759c9fe73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Wed, 1 Jun 2022 14:25:56 +0200
Subject: [PATCH] [the-new-hotness] Prepare for new release in OCP4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit will sync the staging with production for 1.2.0 release and changes
the host to OCP4 cluster.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 playbooks/openshift-apps/the-new-hotness.yml           |  2 +-
 .../the-new-hotness/templates/buildconfig.yml          |  6 ------
 .../the-new-hotness/templates/config.toml              | 10 +++-------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml
index 67cbe03c64..36a509f2fc 100644
--- a/playbooks/openshift-apps/the-new-hotness.yml
+++ b/playbooks/openshift-apps/the-new-hotness.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_control_stg[0]:os_masters[0]
+  hosts: os_control_stg[0]:os_control[0]
   user: root
   gather_facts: False
 
diff --git a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
index a54b8bd1e4..2866716cca 100644
--- a/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
+++ b/roles/openshift-apps/the-new-hotness/templates/buildconfig.yml
@@ -10,11 +10,7 @@ items:
     runPolicy: Serial
     source:
       dockerfile: |-
-{% if env == 'staging' %}
         FROM fedora:36
-{% else %}
-        FROM fedora:34
-{% endif %}
         LABEL \
           name="the-new-hotness" \
           vendor="Fedora Infrastructure" \
@@ -37,8 +33,6 @@ items:
                 git checkout staging && \
 {% else %}
                 git checkout production && \
-                pip-3 install . && \
-                pushd hotness_schema && \
 {% endif %}
                 pip-3 install . && \
                 rm -rf the-new-hotness
diff --git a/roles/openshift-apps/the-new-hotness/templates/config.toml b/roles/openshift-apps/the-new-hotness/templates/config.toml
index f4302d5f08..0f48a02512 100644
--- a/roles/openshift-apps/the-new-hotness/templates/config.toml
+++ b/roles/openshift-apps/the-new-hotness/templates/config.toml
@@ -114,12 +114,8 @@ keywords = "FutureFeature,Triaged"
 bug_status = "NEW"
 short_desc_template = "%(name)s-%(latest_upstream)s is available"
 description_template = """
-{% if env == "staging" %}
 Releases retrieved: %(retrieved_versions)s
 Upstream release that is considered latest: %(latest_upstream)s
-{% else %}
-Latest upstream release: %(latest_upstream)s
-{% endif %}
 Current version/release in %(repo_name)s: %(repo_version)s-%(repo_release)s
 URL: %(url)s
 
@@ -131,12 +127,12 @@ Please keep in mind that with any upstream change, there may also be packaging c
 
 {% if env == "staging" %}
 Based on the information from Anitya: https://stg.release-monitoring.org/project/%(projectid)s/\n
-
-To change the monitoring settings for the project, please visit:
-%(dist_git_url)s
 {% else %}
 Based on the information from Anitya: https://release-monitoring.org/project/%(projectid)s/\n
 {% endif %}
+
+To change the monitoring settings for the project, please visit:
+%(dist_git_url)s
 """
 
 [consumer_config.koji]