Support Pulpcore nightly in Forklift setup

theforeman · Oct 31, 2023 · e1316a1 · e1316a1
1 parent 58b464e
commit e1316a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml
@@ -14,7 +14,7 @@
       state: present
     when:
      - pipeline_version is defined
-     - pipeline_version is version('3.28', '>=')
+     - pipeline_version == 'nightly' or pipeline_version is version('3.28', '>=')
      - pipeline_os is defined
      - pipeline_os is search("centos8-stream")
 

diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml
@@ -19,8 +19,8 @@ pulp_install_plugins_base:
   pulp-rpm: {}
 pulp_install_plugins_314:
   pulp-python: {}
-pulp_install_plugins: "{{ pulp_install_plugins_base | combine(pulp_install_plugins_314 if pipeline_version is version('3.14', '>=') else {}) }}"
+pulp_install_plugins: "{{ pulp_install_plugins_base | combine(pulp_install_plugins_314 if pipeline_version == 'nightly' or pipeline_version is version('3.14', '>=') else {}) }}"
 pulp_default_admin_password: password
 pulp_pkg_name_prefix_py36: "python3-"
 pulp_pkg_name_prefix_py38: "{{ 'tfm-pulpcore-python3-' if pipeline_os == 'centos7' else 'python38-' }}"
-pulp_pkg_name_prefix: "{{ pulp_pkg_name_prefix_py38 if pipeline_version is version('3.15', '>=') else pulp_pkg_name_prefix_py36 }}"
+pulp_pkg_name_prefix: "{{ pulp_pkg_name_prefix_py38 if pipeline_version == 'nightly' or pipeline_version is version('3.15', '>=') else pulp_pkg_name_prefix_py36 }}"
diff --git a/playbooks/setup_forklift.yml b/playbooks/setup_forklift.yml
@@ -87,7 +87,7 @@
       when:
         - forklift_install_pulp_from_galaxy
         - pipeline_version is defined
-        - pipeline_version is version('3.17', '<=')
+        - pipeline_version != 'nightly' and pipeline_version is version('3.17', '<=')
       retries: 3
       register: result
       until: result is succeeded
@@ -99,7 +99,7 @@
       when:
         - forklift_install_pulp_from_galaxy
         - pipeline_version is defined
-        - pipeline_version is version('3.18', '>=')
+        - pipeline_version == 'nightly' or pipeline_version is version('3.18', '>=')
       retries: 3
       register: result
       until: result is succeeded