Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove old boxes and Pulp 2 related & cleanup_rh_ruby25 roles #1691

Merged
merged 5 commits into from
Aug 24, 2023
Merged

Remove old boxes and Pulp 2 related & cleanup_rh_ruby25 roles #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
860502c
Remove Foreman 2.4 - 3.3 configs
ekohl Aug 10, 2023
f6d0211
Stop setting pulp repository versions
ekohl Aug 10, 2023
0a66d12
Remove pulp_repositories role
ekohl Aug 10, 2023
b93f5f8
Remove remove_pulp2 role
ekohl Aug 10, 2023
c63a61e
Remove cleanup_rh_ruby25 role
ekohl Aug 10, 2023
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: 0 additions & 1 deletion docs/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ forklift_boxes:
box: centos7
memory: 3072
katello_repositories_version: '3.11'
katello_repositories_pulp_version: '2.19'
foreman_repositories_version: '1.21'
foreman_client_repositories_version: "{{ foreman_repositories_version }}"
```
Expand Down
1 change: 0 additions & 1 deletion packer/scripts/build_stable_dev_box.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ def ansible_variable_json(version_hash)
'katello_repositories_version': version_hash['katello'],
'foreman_repositories_version': version_hash['foreman'],
'pulpcore_repositories_version': version_hash['pulpcore'],
'pulp_repositories_version': version_hash['pulp'],
'foreman_installer_options': ["--katello-devel-katello-scm-revision=#{katello_branch}", "--katello-devel-foreman-scm-revision=#{foreman_branch}"]

}
Expand Down
8 changes: 0 additions & 8 deletions pipelines/upgrade/05-server_to_intermediate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,3 @@
- foreman_server_repositories
- role: foreman_installer
foreman_installer_skip_installer: "{{ true if forklift_upgrade_version_start == forklift_upgrade_version_intermediate else false }}"
- role: remove_pulp2
when:
- forklift_upgrade_version_intermediate == "4.0"
- pipeline_remove_pulp2 is defined
- pipeline_remove_pulp2
- role: cleanup_rh_ruby25
when:
- forklift_upgrade_version_intermediate == "2.5" or forklift_upgrade_version_intermediate == "4.1"
8 changes: 0 additions & 8 deletions pipelines/upgrade/06-proxy_to_intermediate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,3 @@
- foreman_server_repositories
- role: foreman_proxy_content
when: forklift_upgrade_version_start != forklift_upgrade_version_intermediate
- role: remove_pulp2
when:
- forklift_upgrade_version_intermediate == "4.0"
- pipeline_remove_pulp2 is defined
- pipeline_remove_pulp2
- role: cleanup_rh_ruby25
when:
- forklift_upgrade_version_intermediate == "2.5" or forklift_upgrade_version_intermediate == "4.1"
8 changes: 0 additions & 8 deletions pipelines/upgrade/07-server_to_final.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@
scenario_version: "{{ forklift_upgrade_version_final }}"
- foreman_server_repositories
- foreman_installer
- role: remove_pulp2
when:
- forklift_upgrade_version_final == "4.0"
- pipeline_remove_pulp2 is defined
- pipeline_remove_pulp2
- role: cleanup_rh_ruby25
when:
- forklift_upgrade_version_final == "nightly" or forklift_upgrade_version_final == "2.5" or forklift_upgrade_version_final == "4.1"
8 changes: 0 additions & 8 deletions pipelines/upgrade/09-proxy_to_final.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,3 @@
scenario_version: "{{ forklift_upgrade_version_final }}"
- foreman_server_repositories
- foreman_proxy_content
- role: remove_pulp2
when:
- forklift_upgrade_version_final == "4.0"
- pipeline_remove_pulp2 is defined
- pipeline_remove_pulp2
- role: cleanup_rh_ruby25
when:
- forklift_upgrade_version_final == "nightly" or forklift_upgrade_version_final == "2.5" or forklift_upgrade_version_final == "4.1"
1 change: 0 additions & 1 deletion pipelines/vars/forklift_katello.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ server_box:
bats_tests_additional:
- fb-katello-proxy.bats
- "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
pipeline_remove_pulp2: true
proxy_box:
box: "{{ pipeline_os }}"
memory: 3072
Expand Down
1 change: 0 additions & 1 deletion pipelines/vars/forklift_luna.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ server_box:
- "fb-test-foreman-templates.bats"
- "fb-katello-proxy.bats"
- "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
pipeline_remove_pulp2: true
proxy_box:
box: "{{ pipeline_os }}"
memory: 3072
Expand Down
1 change: 0 additions & 1 deletion pipelines/vars/katello_devel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ forklift_boxes:
memory: 8192
variables:
katello_repositories_version: nightly
katello_repositories_pulp_version: nightly
foreman_repositories_version: nightly
foreman_client_repositories_version: nightly
8 changes: 0 additions & 8 deletions roles/cleanup_rh_ruby25/tasks/main.yml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions roles/forklift_versions/library/forklift_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,8 @@ def main():
'foreman_client_repositories_version': version['foreman'],
'katello_repositories_version': version['katello'],
'foreman_puppet_repositories_version': version['puppet'],
'pulpcore_repositories_version': version['pulpcore'],
}
if 'pulp' in version:
forklift_vars['katello_repositories_pulp_version'] = version['pulp']
forklift_vars['pulp_repositories_version'] = version['pulp']
if 'pulpcore' in version:
forklift_vars['pulpcore_repositories_version'] = version['pulpcore']
ret = forklift_vars
break
else:
Expand Down
36 changes: 18 additions & 18 deletions roles/forklift_versions/molecule/default/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@
vars:
forklift_versions_file: "{{ playbook_dir }}/fixtures/versions.yaml"
pipeline_type: katello
pipeline_os: centos7
pipeline_os: centos8-stream
tasks:
- name: "Include forklift_versions for 4.3 installs"
- name: "Include forklift_versions for 4.8 installs"
include_role:
name: "forklift_versions"
vars:
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.3"
scenario_version: "4.8"
- name: Ensure versions have been set correctly
assert:
that:
- foreman_repositories_version == '3.1'
- katello_repositories_version == '4.3'
- pulpcore_repositories_version == '3.16'
- foreman_repositories_version == '3.6'
- katello_repositories_version == '4.8'
- pulpcore_repositories_version == '3.22'

- name: "Include forklift_versions for 4.4 installs"
include_role:
name: "forklift_versions"
vars:
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.4"
scenario_version: "4.9"
- name: Ensure versions have been set correctly
assert:
that:
- foreman_repositories_version == '3.2'
- katello_repositories_version == '4.4'
- pulpcore_repositories_version == '3.16'
- foreman_repositories_version == '3.7'
- katello_repositories_version == '4.9'
- pulpcore_repositories_version == '3.22'

- name: "Include forklift_versions for nightly installs"
include_role:
Expand All @@ -57,27 +57,27 @@
vars:
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.4"
scenario_version: "4.9"
upgrade: True
- name: Ensure upgrade steps have been determined correctly
assert:
that:
- forklift_upgrade_version_start == '4.2'
- forklift_upgrade_version_intermediate == '4.3'
- forklift_upgrade_version_final == '4.4'
- forklift_upgrade_version_start == '4.7'
- forklift_upgrade_version_intermediate == '4.8'
- forklift_upgrade_version_final == '4.9'

- name: "Include forklift_versions for upgrades with upgrade_step=2"
include_role:
name: "forklift_versions"
vars:
scenario: "{{ pipeline_type }}"
scenario_os: "{{ pipeline_os }}"
scenario_version: "4.4"
scenario_version: "4.9"
upgrade: True
upgrade_step: 2
- name: Ensure upgrade steps have been determined correctly
assert:
that:
- forklift_upgrade_version_start == '4.0'
- forklift_upgrade_version_intermediate == '4.2'
- forklift_upgrade_version_final == '4.4'
- forklift_upgrade_version_start == '4.5'
- forklift_upgrade_version_intermediate == '4.7'
- forklift_upgrade_version_final == '4.9'
1 change: 0 additions & 1 deletion roles/katello_repositories/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
katello_repositories_version: nightly
katello_repositories_environment: "{{ foreman_repositories_environment | default('release') }}"
katello_repositories_pulp_version: 2.21
katello_repositories_pulp_release: stable
3 changes: 0 additions & 3 deletions roles/pulp_repositories/defaults/main.yml
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions roles/pulp_repositories/tasks/main.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions roles/remove_pulp2/tasks/main.yml
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions vagrant/config/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,4 @@
installers:
- foreman: '2.4'
katello: '4.0'
pulp: '2.21'
pulpcore: '3.9'
puppet: 6
boxes:
- 'centos7'
- 'centos7-fips'
- 'debian10'
- 'ubuntu1804'

- foreman: '2.5'
katello: '4.1'
pulpcore: '3.14'
puppet: 6
boxes:
- 'centos7'
- 'centos7-fips'
- 'centos8-stream'
- 'debian10'
- 'ubuntu1804'
- 'ubuntu2004'

- foreman: '3.0'
katello: '4.2'
pulpcore: '3.14'
puppet: 6
boxes:
- 'almalinux8'
- 'centos7'
- 'centos7-fips'
- 'centos8-stream'
- 'debian10'
- 'ubuntu1804'
- 'ubuntu2004'

- foreman: '3.1'
katello: '4.3'
pulpcore: '3.16'
puppet: 7
boxes:
- 'almalinux8'
- 'centos7'
- 'centos7-fips'
- 'centos8-stream'
- 'debian10'
- 'ubuntu2004'

- foreman: '3.2'
katello: '4.4'
pulpcore: '3.16'
puppet: 7
boxes:
- 'almalinux8'
- 'centos7'
- 'centos7-fips'
- 'centos8-stream'
- 'debian10'
- 'debian11'
- 'ubuntu2004'

- foreman: '3.3'
katello: '4.5'
pulpcore: '3.18'
Expand Down
2 changes: 0 additions & 2 deletions vagrant/lib/forklift/box_factory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ def build_box(base_box, group, playbook, version)
'foreman_repositories_version' => version['foreman'],
'foreman_client_repositories_version' => version['foreman'],
'katello_repositories_version' => version['katello'],
'katello_repositories_pulp_version' => version['pulp'],
'pulp_repositories_version' => version['pulp'],
'pulpcore_repositories_version' => version['pulpcore'],
'foreman_puppet_repositories_version' => version['puppet']
)
Expand Down
Loading