Skip to content

Commit

Permalink
Fix versions logic on pulpcore pipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
Odilhao authored and ehelms committed Mar 18, 2024
1 parent a17e13d commit 77e9c42
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions pipelines/pulpcore/02-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
name: '@postgresql:12'
state: present
when:
- pipeline_version is defined
- pipeline_version != 'nightly' or pipeline_version is version('3.40', '<')
- pipeline_os is defined
- pipeline_os is search("centos8-stream")
- pipeline_version is defined
- pipeline_version != 'nightly' and pipeline_version is version('3.39', '<=' )
- pipeline_os is defined
- pipeline_os is search("centos8-stream")

- name: install pulpcore
hosts:
- "{{ forklift_server_name }}"
- "{{ forklift_name }}"
become: True
vars_files:
- ../vars/install_base.yml
Expand All @@ -37,11 +37,11 @@
- role: epel_repositories
when:
- pipeline_version is defined
- pipeline_version != 'nightly' and pipeline_version is version('3.28', '==' )
- pipeline_version != 'nightly' and pipeline_version is version('3.39', '<=' )
- role: pulp.pulp_installer.pulp_all_services
when:
- pipeline_version is defined
- pipeline_version != 'nightly' or pipeline_version is version('3.39', '==')
- pipeline_version != 'nightly' and pipeline_version is version('3.39', '<=' )

- name: Setup git repo
become: True
Expand Down
3 changes: 2 additions & 1 deletion pipelines/pulpcore/03-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
name: beaker
tasks_from: test
when:
- pipeline_version == 'nightly' or pipeline_version is version('3.40, '>=' )
- pipeline_version is defined
- pipeline_version == 'nightly' or pipeline_version is version('3.40', '>=' )
vars:
beaker_puppet_module: "puppet-pulpcore"
beaker_os: "{{ pipeline_os.replace('-stream', '') }}"
Expand Down
2 changes: 1 addition & 1 deletion playbooks/setup_forklift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
command:
cmd: ansible-galaxy role install -r playbooks/galaxy_collections/ansible_collections/pulp/pulp_installer/requirements.yml
chdir: "{{ forklift_dest }}"
when:
when:
- forklift_install_pulp_from_galaxy
- pipeline_version is defined
- pipeline_version != 'nightly'
Expand Down

0 comments on commit 77e9c42

Please sign in to comment.