From 15e1f42c0619e99ea3c4b61071f2407b1cbb5662 Mon Sep 17 00:00:00 2001 From: Aswin K R Date: Thu, 27 Jun 2024 13:55:11 +0530 Subject: [PATCH] remove some tags --- .../roles/Common/tasks/Alpine.yml | 1 - .../roles/Common/tasks/CentOS.yml | 1 - .../roles/Common/tasks/Debian.yml | 1 - .../roles/Common/tasks/Fedora.yml | 1 - .../roles/Common/tasks/FreeBSD.yml | 1 - .../roles/Common/tasks/RedHat.yml | 1 - .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml | 1 - .../roles/Common/tasks/Ubuntu.yml | 1 - .../roles/Common/tasks/build_packages_and_tools.yml | 2 -- .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml | 6 ++---- .../roles/Common/tasks/openSUSE.yml | 1 - 11 files changed, 2 insertions(+), 15 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml index f4afae4584..60c7789130 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml @@ -8,7 +8,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] - name: Checking for /usr/lib/jvm stat: path=/usr/lib/jvm diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml index cb1484d8ce..d4fd79140f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -59,7 +59,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml index b01c36206c..0da1c4dbed 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml @@ -130,7 +130,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml index 73b5da6ab0..e81cb80544 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml @@ -33,7 +33,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml index b316c33c8e..d34fb2bc75 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml @@ -38,7 +38,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml index 8f1ddd0797..11a8aa4d87 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml @@ -48,7 +48,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml index 6eed1c2b5a..3de6fa65a0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml @@ -39,7 +39,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml index 17c1372ca1..37ffdfd28b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml @@ -45,7 +45,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml index c5b02964a9..0a7bc0226c 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/build_packages_and_tools.yml @@ -5,14 +5,12 @@ - name: Set package manager var set_fact: package_var: "latest" - tags: [build_tools, test_tools] - name: Set package manager var for FreeBSD set_fact: package_var: "present" when: - ansible_distribution == "FreeBSD" - tags: [build_tools, test_tools] - name: Install Build Tool Packages package: "name={{ item }} state={{ package_var }}" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml index e12179c71e..20e78dd920 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/main.yml @@ -20,7 +20,7 @@ ######################## - name: Include OS variables include_vars: "../vars/{{ ansible_distribution }}.yml" - tags: [build_tools, install_java, main, test_tools] + tags: main ############################## # OS setup and configuration # @@ -28,9 +28,7 @@ # If this errors, upgrade ansible to >=2.4 - name: Perform OS setup and configuration include_tasks: "{{ ansible_distribution }}.yml" - tags: [adoptopenjdk, azul-key, brew_cu, brew_upgrade, build_tools, build_tools_jfx, core_dump, cups, default_java, - expat, freetype, install_java, java8_SLES11, java8_SUSE, jck_tools, jenkins_user, kernel_tuning, libffi_sles, - locales, main, patch_update, rosetta, solaris_studio, SUSE_gcc48, test_tools, zlib] + tags: main ################### # cmake on armv7l # diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml index 65f33d237c..d527fadf8c 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml @@ -44,7 +44,6 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml - tags: [build_tools, test_tools] ########################## # Additional build tools #