Remove remove_pulp2 role

theforeman · Aug 24, 2023 · 0934ad2 · 0934ad2
1 parent 890a1e6
commit 0934ad2
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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