use new pulpcore repos for katello 3.18+

ianballou · Sep 1, 2020 · cf22cce · cf22cce
1 parent 54a6576
commit cf22cce
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/roles/forklift_versions/library/forklift_versions.py b/roles/forklift_versions/library/forklift_versions.py
@@ -87,6 +87,8 @@ def main():
                         'pulp_repositories_version': version['pulp'],
                         'puppet_repositories_version': version['puppet'],
                         }
+                if 'pulpcore' in version:
+                    forklift_vars['pulpcore_repositories_version'] = version['pulpcore']
                 ret = forklift_vars
                 break
     else:

diff --git a/roles/forklift_versions/molecule/default/verify.yml b/roles/forklift_versions/molecule/default/verify.yml
@@ -22,6 +22,21 @@
         that:
           - foreman_repositories_version == '2.2'
           - katello_repositories_version == '3.17'
+          - pulpcore_repositories_version is not defined
+
+    - name: "Include forklift_versions for nightly installs"
+      include_role:
+        name: "forklift_versions"
+      vars:
+        scenario: "{{ pipeline_type }}"
+        scenario_os: "{{ pipeline_os }}"
+        scenario_version: "nightly"
+    - name: Ensure versions have been set correctly
+      assert:
+        that:
+          - foreman_repositories_version is defined
+          - katello_repositories_version is defined
+          - pulpcore_repositories_version is defined
 
     - name: "Include forklift_versions for upgrades"
       include_role:

diff --git a/roles/katello_repositories/tasks/staging_repos.yml b/roles/katello_repositories/tasks/staging_repos.yml
@@ -44,7 +44,7 @@
     - katello_repositories_pulp_version == "nightly"
     - ansible_distribution_major_version == '7'
 
-- name: 'Add Pulpcore repository'
+- name: 'Add Katello Pulpcore repository'
   yum_repository:
     name: pulpcore-repository
     description: Pulpcore repository for Katello {{ katello_repositories_version }}
@@ -53,7 +53,15 @@
     enabled: yes
     include: /etc/yum/foreman.conf
   when:
-    - katello_repositories_version == "nightly" or katello_repositories_version is version('3.15', '>=')
+    - katello_repositories_version != 'nightly'
+    - katello_repositories_version is version('3.15', '>=')
+    - katello_repositories_version is version('3.17', '<=')
+
+- name: 'Add Pulpcore repository'
+  include_role:
+    name: pulpcore_repositories
+  when:
+    - katello_repositories_version == "nightly" or katello_repositories_version is version('3.18', '>=')
 
 - name: 'Katello {{ katello_repositories_version }} Client Koji repository'
   yum_repository:

diff --git a/roles/pulpcore_repositories/defaults/main.yml b/roles/pulpcore_repositories/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+pulpcore_repositories_version: '3.6'
diff --git a/roles/pulpcore_repositories/tasks/main.yml b/roles/pulpcore_repositories/tasks/main.yml
@@ -0,0 +1,8 @@
+---
+- name: "Add Pulpcore {{ pulpcore_repositories_version }} repository"
+  yum_repository:
+    name: pulpcore-repository
+    description: Pulpcore {{ pulpcore_repositories_version }}
+    baseurl: "https://yum.theforeman.org/pulpcore/{{ pulpcore_repositories_version }}/el{{ ansible_distribution_major_version }}/x86_64/"
+    gpgcheck: no
+    enabled: yes
diff --git a/vagrant/config/versions.yaml b/vagrant/config/versions.yaml
@@ -90,6 +90,7 @@ installers:
   - foreman: 'nightly'
     katello: 'nightly'
     pulp: '2.21'
+    pulpcore: '3.6'
     puppet: 6
     boxes:
       - 'centos7'