From 450829815db70008e40af66ec6b651739c02287c Mon Sep 17 00:00:00 2001
From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com>
Date: Sun, 26 Jan 2020 08:23:05 +0000
Subject: [PATCH] Added build tags to appropriate roles (#1100)

* Added build tags to appropriate roles

* change hosts back from all

* test prereq packages for centos added

* added libcurl-devel packages

* Remove trailing spaces
---
 .../AdoptOpenJDK_Unix_Playbook/main.yml       | 22 ++++++++++++++-----
 .../roles/Common/vars/CentOS.yml              |  8 +++++++
 .../roles/Common/vars/RedHat.yml              |  4 ++++
 .../roles/Common/vars/SLES.yml                |  2 ++
 .../roles/Common/vars/Ubuntu.yml              |  5 +++++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index 52571b6823..71294bb348 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -25,30 +25,40 @@
     - autoconf
     - curl
     - Jenkins_User                # AdoptOpenJDK Infrastructure
-    - freemarker                  # OpenJ9
+    - role: freemarker            # OpenJ9
+      tags: [build_tools, build_tools_openj9]
     - ant                         # Testing
     - Ant-Contrib                 # Testing
     - GIT_Source
     - CPAN
     - gmake
     - Docker                      # Testing
-    - NVidia_Cuda_Toolkit         # OpenJ9
+    - role: NVidia_Cuda_Toolkit   # OpenJ9
+      tags: [build_tools, build_tools_openj9]
     - Superuser                   # AdoptOpenJDK Infrastructure
     - Swap_File
     - Crontab
     - NTP_TIME
     - gcc_48
-    - gcc_7                       # OpenJ9
-    - cmake                       # OpenJ9 / OpenJFX
-    - Protobuf                    # OpenJ9 (JITserver)
+    - role: gcc_7                 # OpenJ9
+      tags: [build_tools, build_tools_openj9]
+    - role: cmake                 # OpenJ9 / OpenJFX
+      tags: [build_tools, build_tools_openj9, build_tools_openjfx]
+    - role: Protobuf              # OpenJ9 (JITserver)
+      tags: [build_tools, build_tools_openj9]
     - ccache
-    - {role: nasm, when: ansible_architecture == 'x86_64'} # OpenJ9
+    - role: nasm                  # OpenJ9
+      when: ansible_architecture == 'x86_64'
+      tags: [build_tools, build_tools_openj9]
     - role: adoptopenjdk_install  # JDK11 Build Bootstrap
       jdk_version: 10
+      tags: build_tools
     - role: adoptopenjdk_install  # JDK13 Build Bootstrap
       jdk_version: 12
+      tags: build_tools
     - role: adoptopenjdk_install  # JDK14 Build Bootstrap
       jdk_version: 13
+      tags: build_tools
     - role: local_srcinstall
       src_tarball: https://github.com/protocolbuffers/protobuf/releases/download/v3.5.1/protobuf-cpp-3.5.1.tar.gz
       installed_target: /usr/local/bin/protoc
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
index 608ddc9b0c..3be9472411 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -74,6 +74,14 @@ Additional_Build_Tools_CentOS_x86:
   - libstdc++.i686                # a dependency required for executing a 32-bit C binary
 
 Test_Tool_Packages:
+  - gcc
+  - gcc-c++
+  - unzip
+  - lbzip2
+  - zlib-devel
+  - perl-devel
+  - libcurl-devel
+  - openssl-devel
   - mercurial
   - perl
   - xorg-x11-xauth
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
index 52f6238cd9..c83d0f6e06 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
@@ -83,5 +83,9 @@ Test_Tool_Packages:
   - perl
   - xorg-x11-xauth
   - xorg-x11-server-Xvfb
+  - zlib-devel
+  - perl-devel
+  - expat-devel
+  - libcurl-devel
 
 crontab_Patching: "/usr/bin/yum -y update && yum clean packages"
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml
index 5b1d355e40..e2d57d5602 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml
@@ -48,6 +48,8 @@ Additional_Build_Tools_SLES_x86:
   - libstdc++6-32bit              # a dependency required for executing a 32-bit C binary
 
 Test_Tool_Packages:
+  - gcc
+  - gcc-c++
   - perl
   - pulseaudio
   - xorg-x11
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
index 53a730830c..adbb9866df 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
@@ -70,6 +70,7 @@ Additional_Packages_Ubuntu16:
   - libgstreamer0.10-dev                # OpenJFX prereq
   - libgstreamer-plugins-base0.10-dev   # OpenJFX prereq
   - openjdk-7-jdk
+  - openjdk-8-jdk
   - libmpfr4
   - libmpfr4-dbg
 
@@ -109,6 +110,10 @@ Test_Tool_Packages:
   - xvfb
   - binfmt-support
   - qemu-user-static
+  - unzip
+  - cpanminus
+  - libexpat1-dev
+  - libcurl4-openssl-dev
 
 Test_Tool_Packages_x86_64:
   - pulseaudio