Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pipelines/vars/forklift_katello.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ server_box:
bats_tests_additional:
- fb-katello-proxy.bats
- "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
- "{{ 'fb-verify-selinux.bats' if (pipeline_action == 'install' and (pipeline_version == 'nightly' or pipeline_version is version('4.18', '>='))) else ''}}"
proxy_box:
box: "{{ pipeline_proxy_os | default(pipeline_os) }}"
memory: 3072
Expand Down
1 change: 1 addition & 0 deletions pipelines/vars/forklift_luna.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ server_box:
- "fb-test-foreman-templates.bats"
- "fb-katello-proxy.bats"
- "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
- "{{ 'fb-verify-selinux.bats' if pipeline_action == 'install' else ''}}"
proxy_box:
box: "{{ pipeline_proxy_os | default(pipeline_os) }}"
memory: 3072
Expand Down
2 changes: 1 addition & 1 deletion roles/foreman_devel/tasks/rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- name: "Enable only RHEL7 base + optional + extras repos"
rhsm_repository:
name: "{{ item }}"
state: "present"
state: "enabled"
become: true
with_items:
- rhel-7-server-rpms
Expand Down
8 changes: 4 additions & 4 deletions roles/forklift_versions/molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.12"
- name: Ensure versions have been set correctly
- name: Ensure versions have been set correctly for 4.12
assert:
that:
- foreman_repositories_version == '3.10'
Expand All @@ -31,7 +31,7 @@
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "nightly"
- name: Ensure versions have been set correctly
- name: Ensure versions have been set correctly for nightly
assert:
that:
- foreman_repositories_version is defined
Expand All @@ -47,7 +47,7 @@
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.13"
upgrade: True
- name: Ensure upgrade steps have been determined correctly
- name: Ensure upgrade steps have been determined correctly for 4.13
assert:
that:
- forklift_upgrade_version_start == '4.12'
Expand All @@ -63,7 +63,7 @@
scenario_version: "4.14"
upgrade: True
upgrade_step: 2
- name: Ensure upgrade steps have been determined correctly
- name: Ensure upgrade steps have been determined correctly for 4.14
assert:
that:
- forklift_upgrade_version_start == '4.10'
Expand Down