From 34682c9b3906ce819eb01e93395bf0aadbc1b4d6 Mon Sep 17 00:00:00 2001
From: Odilon Sousa <osousa@redhat.com>
Date: Thu, 16 Nov 2023 22:56:34 -0300
Subject: [PATCH] Update configuration to unblock Pulp pipelines and also
 release Pulp 3.39

---
 pipelines/pulpcore/02-install.yml |  4 ++--
 playbooks/setup_forklift.yml      | 14 +++++++++++++-
 requirements-pulp-322.yml         |  4 ++--
 requirements-pulp-339.yml         |  3 +++
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 requirements-pulp-339.yml

diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml
index 8ad7de711..199442a8c 100644
--- 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
index 1977038bd..b6f774d23 100644
--- 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
index 6751ffd24..5ad957984 100644
--- 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
new file mode 100644
index 000000000..6751ffd24
--- /dev/null
+++ b/requirements-pulp-339.yml
@@ -0,0 +1,3 @@
+collections:
+  - name: https://github.com/pcreech/pulp_installer
+    type: git