From 22049c1e015fd41b5867bb02c1af9d37a1852834 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Thu, 7 Dec 2023 14:13:20 +0100
Subject: [PATCH] Add real Candlepin repositories for Katello staging

Candlepin now has its own release cycle and we'l always use the real
repositories. The version is now tracked in versions.yaml, just like
Pulpcore.
---
 roles/forklift_versions/library/forklift_versions.py     | 2 ++
 roles/forklift_versions/molecule/default/verify.yml      | 2 ++
 .../tasks/_stagingyum_staging_repos.yml                  | 9 ---------
 roles/katello_repositories/tasks/staging_repos.yml       | 6 ++++++
 vagrant/config/versions.yaml                             | 2 ++
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/roles/forklift_versions/library/forklift_versions.py b/roles/forklift_versions/library/forklift_versions.py
index 1035bc33e..18993335f 100644
--- a/roles/forklift_versions/library/forklift_versions.py
+++ b/roles/forklift_versions/library/forklift_versions.py
@@ -86,6 +86,8 @@ def main():
                         'foreman_puppet_repositories_version': version['puppet'],
                         'pulpcore_repositories_version': version['pulpcore'],
                         }
+                if 'candlepin' in version:
+                    forklift_vars['candlepin_repositories_version'] = version['candlepin']
                 ret = forklift_vars
                 break
     else:
diff --git a/roles/forklift_versions/molecule/default/verify.yml b/roles/forklift_versions/molecule/default/verify.yml
index ae48a5a75..77a76c4a0 100644
--- a/roles/forklift_versions/molecule/default/verify.yml
+++ b/roles/forklift_versions/molecule/default/verify.yml
@@ -22,6 +22,7 @@
           - foreman_repositories_version == '3.6'
           - katello_repositories_version == '4.8'
           - pulpcore_repositories_version == '3.22'
+          - candlepin_repositories_version is not defined
 
     - name: "Include forklift_versions for 4.4 installs"
       include_role:
@@ -50,6 +51,7 @@
           - foreman_repositories_version is defined
           - katello_repositories_version is defined
           - pulpcore_repositories_version is defined
+          - candlepin_repositories_version is defined
 
     - name: "Include forklift_versions for upgrades"
       include_role:
diff --git a/roles/katello_repositories/tasks/_stagingyum_staging_repos.yml b/roles/katello_repositories/tasks/_stagingyum_staging_repos.yml
index 265ea8641..9aa9152bf 100644
--- a/roles/katello_repositories/tasks/_stagingyum_staging_repos.yml
+++ b/roles/katello_repositories/tasks/_stagingyum_staging_repos.yml
@@ -7,12 +7,3 @@
     gpgcheck: no
   tags:
     - packages
-
-- name: 'Candlepin {{ katello_repositories_version }} Staging repository'
-  yum_repository:
-    name: candlepin-staging
-    description: "Candlepin {{ katello_repositories_version }} Staging Repository"
-    baseurl: "https://stagingyum.theforeman.org/candlepin/{{ katello_repositories_version }}/el{{ ansible_distribution_major_version }}/x86_64/"
-    gpgcheck: no
-  tags:
-    - packages
diff --git a/roles/katello_repositories/tasks/staging_repos.yml b/roles/katello_repositories/tasks/staging_repos.yml
index 8b3d9d0ab..364f75604 100644
--- a/roles/katello_repositories/tasks/staging_repos.yml
+++ b/roles/katello_repositories/tasks/staging_repos.yml
@@ -21,3 +21,9 @@
 - name: 'Add Pulpcore repository'
   include_role:
     name: pulpcore_repositories
+
+- name: 'Add Candlepin repository'
+  include_role:
+    name: candlepin_repositories
+  when:
+    - candlepin_repositories_version is defined
diff --git a/vagrant/config/versions.yaml b/vagrant/config/versions.yaml
index c3b909521..6f31d3e2b 100644
--- a/vagrant/config/versions.yaml
+++ b/vagrant/config/versions.yaml
@@ -65,6 +65,7 @@ installers:
 
   - foreman: '3.9'
     katello: '4.11'
+    candlepin: '4.3'
     pulpcore: '3.39'
     puppet: 7
     boxes:
@@ -75,6 +76,7 @@ installers:
 
   - foreman: 'nightly'
     katello: 'nightly'
+    candlepin: '4.3'
     pulpcore: '3.39'
     puppet: 7
     boxes: