diff --git a/pipelines/upgrade/05-server_to_intermediate.yml b/pipelines/upgrade/05-server_to_intermediate.yml index c2ee24006..86e3cb7a3 100644 --- a/pipelines/upgrade/05-server_to_intermediate.yml +++ b/pipelines/upgrade/05-server_to_intermediate.yml @@ -22,11 +22,6 @@ - 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" diff --git a/pipelines/upgrade/06-proxy_to_intermediate.yml b/pipelines/upgrade/06-proxy_to_intermediate.yml index 931fa426c..4252a3e03 100644 --- a/pipelines/upgrade/06-proxy_to_intermediate.yml +++ b/pipelines/upgrade/06-proxy_to_intermediate.yml @@ -23,11 +23,6 @@ - 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" diff --git a/pipelines/upgrade/07-server_to_final.yml b/pipelines/upgrade/07-server_to_final.yml index f6081a074..5c827790d 100644 --- a/pipelines/upgrade/07-server_to_final.yml +++ b/pipelines/upgrade/07-server_to_final.yml @@ -21,11 +21,6 @@ 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" diff --git a/pipelines/upgrade/09-proxy_to_final.yml b/pipelines/upgrade/09-proxy_to_final.yml index 19b1dff01..3a2abb674 100644 --- a/pipelines/upgrade/09-proxy_to_final.yml +++ b/pipelines/upgrade/09-proxy_to_final.yml @@ -22,11 +22,6 @@ 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" diff --git a/pipelines/vars/forklift_katello.yml b/pipelines/vars/forklift_katello.yml index 5a363c498..2f10f2405 100644 --- a/pipelines/vars/forklift_katello.yml +++ b/pipelines/vars/forklift_katello.yml @@ -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 diff --git a/pipelines/vars/forklift_luna.yml b/pipelines/vars/forklift_luna.yml index 63d800f78..ed1bcc7f5 100644 --- a/pipelines/vars/forklift_luna.yml +++ b/pipelines/vars/forklift_luna.yml @@ -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 diff --git a/roles/remove_pulp2/tasks/main.yml b/roles/remove_pulp2/tasks/main.yml deleted file mode 100644 index a56d538e9..000000000 --- a/roles/remove_pulp2/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Run remove Pulp 2 - shell: yes | foreman-maintain content remove-pulp2 # noqa risky-shell-pipe - when: - - ansible_os_family == "RedHat" - - ansible_distribution_major_version == "7"