From e1316a1d9ced95d03d6391e47c43797e23b8adb0 Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Mon, 30 Oct 2023 22:47:12 -0400 Subject: [PATCH] Support Pulpcore nightly in Forklift setup --- pipelines/pulpcore/02-install.yml | 2 +- pipelines/vars/forklift_pulpcore.yml | 4 ++-- playbooks/setup_forklift.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml index 2a37a50cd..4d801b6a7 100644 --- 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 index b85c51aee..946245a3d 100644 --- 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 index fdcba1bf9..1977038bd 100644 --- 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