From 03b96fd7c21db16bc4fefce053c06a02a9c94d35 Mon Sep 17 00:00:00 2001 From: Aswin K R Date: Wed, 5 Jun 2024 12:46:12 +0530 Subject: [PATCH] UnixPB: Add all the tags from the sub folder tasks to main.yml of Common role --- .../roles/Common/tasks/Alpine.yml | 11 ++--------- .../roles/Common/tasks/CentOS.yml | 2 ++ .../roles/Common/tasks/Debian.yml | 2 ++ .../roles/Common/tasks/Fedora.yml | 5 +++++ .../roles/Common/tasks/FreeBSD.yml | 1 + .../roles/Common/tasks/RedHat.yml | 4 ++++ .../roles/Common/tasks/SLES.yml | 10 ++-------- .../roles/Common/tasks/Ubuntu.yml | 5 +++++ .../roles/Common/tasks/build_packages_and_tools.yml | 2 ++ .../roles/Common/tasks/main.yml | 6 ++++-- .../roles/Common/tasks/openSUSE.yml | 1 + 11 files changed, 30 insertions(+), 19 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 5bcfd453af..f4afae4584 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml @@ -8,6 +8,7 @@ ############################ - 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 @@ -31,11 +32,11 @@ - name: Install JDK for x64 when: ansible_architecture == "x86_64" + tags: build_tools block: - name: Check if zulu-7 is already installed in the target location stat: path=/usr/lib/jvm/zulu7 register: zulu7_installed - tags: build_tools - name: Install latest zulu-7 release if not already installed unarchive: @@ -44,7 +45,6 @@ remote_src: yes when: - not zulu7_installed.stat.exists - tags: build_tools - name: Create symlink to point at zulu-7 file: @@ -53,12 +53,10 @@ state: link when: - not zulu7_installed.stat.exists - tags: build_tools - name: Check if zulu-14 is already installed in the target location stat: path=/usr/lib/jvm/zulu14 register: zulu14_installed - tags: build_tools - name: Install latest zulu-14 release if not already installed unarchive: @@ -67,7 +65,6 @@ remote_src: yes when: - not zulu14_installed.stat.exists - tags: build_tools - name: Create symlink to point at zulu-14 file: @@ -76,12 +73,10 @@ state: link when: - not zulu14_installed.stat.exists - tags: build_tools - name: Check if zulu-15 is already installed in the target location stat: path=/usr/lib/jvm/zulu15 register: zulu15_installed - tags: build_tools - name: Install latest zulu-15 release if not already installed unarchive: @@ -90,7 +85,6 @@ remote_src: yes when: - not zulu15_installed.stat.exists - tags: build_tools - name: Create symlink to point at zulu-15 file: @@ -99,7 +93,6 @@ state: link when: - not zulu15_installed.stat.exists - tags: build_tools - name: Install JDK for aarch64 when: ansible_architecture == "aarch64" 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 079cb95eb0..cb1484d8ce 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -11,6 +11,7 @@ - name: Check For Centos8 Stream shell: cat /etc/centos-release register: relfile_contents + tags: build_tools - name: Enable EPEL release (not CentOS8) yum: @@ -58,6 +59,7 @@ ############################ - 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 c1ca42f8ce..b01c36206c 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Debian.yml @@ -8,6 +8,7 @@ ######################################### - name: Allow https apt sources package: "name=apt-transport-https state=latest" + tags: patch_update - name: Add the openjdk repository to apt for openjdk7 apt_repository: repo='ppa:openjdk-r/ppa' update_cache=no @@ -129,6 +130,7 @@ ############################ - 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 15bc519c2d..73b5da6ab0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Fedora.yml @@ -33,6 +33,7 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml + tags: [build_tools, test_tools] ########################## # Additional build tools # @@ -124,21 +125,25 @@ - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64") - not (ansible_distribution_major_version == "8") - not (ansible_distribution_major_version == "35" and ansible_distribution == "Fedora") + tags: install_java - name: Install Java when RedHat 6 on ppc64 package: "name={{ item }} state=latest" with_items: "{{ Java_RHEL6_PPC64 }}" when: (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64") + tags: install_java - name: Install Java when RedHat 8 package: "name={{ item }} state=latest" with_items: "{{ Java_RHEL8 }}" when: (ansible_distribution_major_version == "8") + tags: install_java - name: Install Java when Fedora 35 package: "name={{ item }} state=latest" with_items: "{{ Java_FED35 }}" when: (ansible_distribution_major_version == "35" and ansible_distribution != "Fedora") + tags: install_java #################### # Set default Java # 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 d34fb2bc75..b316c33c8e 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/FreeBSD.yml @@ -38,6 +38,7 @@ ############################ - 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 69268ba445..8f1ddd0797 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml @@ -48,6 +48,7 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml + tags: [build_tools, test_tools] ########################## # Additional build tools # @@ -137,16 +138,19 @@ when: - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64") - not (ansible_distribution_major_version == "8") + tags: install_java - name: Install Java when RedHat 6 on ppc64 package: "name={{ item }} state=latest" with_items: "{{ Java_RHEL6_PPC64 }}" when: (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64") + tags: install_java - name: Install Java when RedHat 8 package: "name={{ item }} state=latest" with_items: "{{ Java_RHEL8 }}" when: (ansible_distribution_major_version == "8") + tags: install_java #################### # Set default Java # 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 71cc7ab63b..6eed1c2b5a 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/SLES.yml @@ -39,6 +39,7 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml + tags: [build_tools, test_tools] ########################## # Additional build tools # @@ -87,14 +88,13 @@ - name: Install Git SLES 12 SP5 when: (ansible_distribution_major_version == "12" and ansible_distribution_version == "12.5") + tags: build_tools block: - name: Test if Git Is Installed At /usr/local/bin shell: /usr/local/bin/git --version >/dev/null failed_when: false register: git_installed changed_when: false - tags: - - build_tools - name: Test if git is installed at the correct version shell: /usr/local/bin/git --version | sed -e 's/git version //g' | awk -F'[.]' '{print $1 "." $2}' @@ -102,8 +102,6 @@ - git_installed.rc == 0 register: git_version changed_when: false - tags: - - build_tools - name: Get Git Source get_url: @@ -120,8 +118,6 @@ chdir: /tmp when: - (git_installed.rc != 0) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.31', operator='lt')) - tags: - - build_tools - name: Compile Git 2.31.0 shell: | @@ -131,8 +127,6 @@ gmake install when: - (git_installed.rc != 0) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.31', operator='lt')) - tags: - - build_tools - name: Install additional build tools for SLES 11 package: "name={{ item }} state=latest" 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 171cbc67d2..17c1372ca1 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Ubuntu.yml @@ -45,6 +45,7 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml + tags: [build_tools, test_tools] ########################## # Additional build tools # @@ -118,12 +119,14 @@ with_items: "{{ Additional_Packages_Ubuntu16 }}" when: - ansible_distribution_major_version == "16" + tags: test_tools - name: Install additional Packages specific to Ubuntu 18 package: "name={{ item }} state=latest" with_items: "{{ Additional_Packages_Ubuntu18 }}" when: - ansible_distribution_major_version == "18" + tags: test_tools - name: Download LibFFI6 v3.2.1_8 For Ubuntu 20 or 22 on S390X get_url: @@ -135,12 +138,14 @@ when: - (ansible_distribution_major_version == "20" and ansible_architecture == "s390x") or (ansible_distribution_major_version == "22" and ansible_architecture == "s390x") + tags: test_tools - name: Install LibFFI6 v3.2.1_8 For Ubuntu 20 or 22 on S390X apt: deb="/tmp/libffi6_3.2.1-8_s390x.deb" when: - (ansible_distribution_major_version == "20" and ansible_architecture == "s390x") or (ansible_distribution_major_version == "22" and ansible_architecture == "s390x") + tags: test_tools #################### # Set default Java # 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 0a7bc0226c..c5b02964a9 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,12 +5,14 @@ - 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 20e78dd920..e12179c71e 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: main + tags: [build_tools, install_java, main, test_tools] ############################## # OS setup and configuration # @@ -28,7 +28,9 @@ # If this errors, upgrade ansible to >=2.4 - name: Perform OS setup and configuration include_tasks: "{{ ansible_distribution }}.yml" - tags: main + 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] ################### # 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 be2b631a4d..c762df8858 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/openSUSE.yml @@ -53,6 +53,7 @@ ############################ - name: Call Build Packages and Tools Task include_tasks: build_packages_and_tools.yml + tags: [build_tools, test_tools] ########################## # Additional build tools #