Update configuration to unblock Pulp pipelines and also release Pulp …

…3.39
theforeman · Nov 17, 2023 · 34682c9 · 34682c9
1 parent 5a06c51
commit 34682c9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml
@@ -28,10 +28,10 @@
   environment:
     DJANGO_SETTINGS_MODULE: pulpcore.app.settings
   pre_tasks:
-    - when: pipeline_version != 'nightly'
+    - when: pipeline_version != 'nightly' or pipeline_version is version('3.28', '<=')
       set_fact:
         pulp_pkg_repo: "http://koji.katello.org/releases/yum/pulpcore-{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/"
-    - when: pipeline_version == 'nightly'
+    - when: pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=')
       set_fact:
         pulp_pkg_repo: "https://stagingyum.theforeman.org/pulpcore/{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/"
         pulp_pkg_name_prefix: "python3.11-"

diff --git a/playbooks/setup_forklift.yml b/playbooks/setup_forklift.yml
@@ -99,7 +99,19 @@
       when:
         - forklift_install_pulp_from_galaxy
         - pipeline_version is defined
-        - pipeline_version == 'nightly' or pipeline_version is version('3.18', '>=')
+        - pipeline_version != 'nightly' or pipeline_version is version('3.18', '>=')
+      retries: 3
+      register: result
+      until: result is succeeded
+
+    - name: 'Install Forklift Pulp collection dependencies for >3.39'
+      command:
+        cmd: ansible-galaxy collection install -r requirements-pulp-339.yml
+        chdir: "{{ forklift_dest }}"
+      when:
+        - forklift_install_pulp_from_galaxy
+        - pipeline_version is defined
+        - pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=')
       retries: 3
       register: result
       until: result is succeeded

diff --git a/requirements-pulp-322.yml b/requirements-pulp-322.yml
@@ -1,3 +1,3 @@
 collections:
-  - name: https://github.com/pcreech/pulp_installer
-    type: git
+  - name: pulp.pulp_installer
+    type: 3.22.0
diff --git a/requirements-pulp-339.yml b/requirements-pulp-339.yml
@@ -0,0 +1,3 @@
+collections:
+  - name: https://github.com/pcreech/pulp_installer
+    type: git