From 963ac2310d212ebf4755d58d1e0991cbf12dc28a Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 12 Feb 2021 12:25:11 +0000 Subject: [PATCH] Fixes Signed-off-by: Stewart X Addison --- .../AdoptOpenJDK_Unix_Playbook/dockerhost.yml | 6 +- .../AdoptOpenJDK_Unix_Playbook/main.yml | 1 + .../roles/Common/vars/CentOS.yml | 2 - .../roles/Common/vars/Debian.yml | 2 - .../roles/Common/vars/FreeBSD.yml | 2 - .../roles/Common/vars/RedHat.yml | 2 - .../roles/Common/vars/SLES.yml | 2 - .../roles/Common/vars/Solaris.yml | 2 - .../roles/Common/vars/Ubuntu.yml | 2 - .../roles/Common/vars/openSUSE.yml | 2 - .../roles/Crontab/tasks/main.yml | 37 ++++-- .../DockerStatic/Dockerfiles/Dockerfile.cent8 | 4 +- .../DockerStatic/Dockerfiles/Dockerfile.f33 | 6 +- .../DockerStatic/Dockerfiles/Dockerfile.u1604 | 6 +- .../DockerStatic/Dockerfiles/Dockerfile.u1804 | 6 +- .../DockerStatic/Dockerfiles/Dockerfile.u2004 | 6 +- .../DockerStatic/Dockerfiles/Dockerfile.u2010 | 6 +- .../roles/DockerStatic/tasks/main.yml | 61 ++++++--- .../roles/adopt_etc/tasks/main.yml | 18 ++- .../roles/adopt_etc/vars/Alpine.yml | 58 --------- .../roles/adopt_etc/vars/CentOS.yml | 93 -------------- .../roles/adopt_etc/vars/Debian.yml | 106 ---------------- .../roles/adopt_etc/vars/FreeBSD.yml | 47 ------- .../roles/adopt_etc/vars/MacOSX.yml | 34 ----- .../roles/adopt_etc/vars/RedHat.yml | 102 --------------- .../roles/adopt_etc/vars/SLES.yml | 81 ------------ .../roles/adopt_etc/vars/Solaris.yml | 30 ----- .../roles/adopt_etc/vars/Ubuntu.yml | 118 ------------------ .../roles/adopt_etc/vars/openSUSE.yml | 69 ---------- 29 files changed, 107 insertions(+), 804 deletions(-) delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Alpine.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/CentOS.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Debian.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/FreeBSD.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/MacOSX.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/RedHat.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/SLES.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Solaris.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Ubuntu.yml delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/openSUSE.yml diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml index edfc60a9e6..a32501ad32 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockerhost.yml @@ -20,20 +20,20 @@ roles: - Debug - Version + - adopt_etc - Providers # AdoptOpenJDK Infrastructure - Get_Vendor_Files - Jenkins_User # AdoptOpenJDK Infrastructure - Superuser # AdoptOpenJDK Infrastructure - role: Swap_File - role: Crontab - - role: NTP_TIME - role: adoptopenjdk_install jdk_version: 11 - - role: Nagios_Plugins # AdoptOpenJDK Infrastructure + - role: Nagios_Plugins # AdoptOpenJDK Infrastructure tags: [nagios_plugins, adoptopenjdk] - role: Nagios_Master_Config # AdoptOpenJDK Infrastructure tags: [nagios_master_config, adoptopenjdk] - - role: Nagios_Tunnel # AdoptOpenJDK Infrastructure + - role: Nagios_Tunnel # AdoptOpenJDK Infrastructure tags: [nagios_tunnel, adoptopenjdk] - Security - Vendor diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index f8a5dd91fa..ca5e284d4c 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -23,6 +23,7 @@ - role: Get_Vendor_Files tags: [vendor_files, adoptopenjdk, jenkins_user, nagios_plugins, superuser] - Version + - adopt_etc - Common - Providers # AdoptOpenJDK Infrastructure - autoconf 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 d7920d58e5..c83819c2be 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml @@ -89,5 +89,3 @@ Test_Tool_Packages: - xorg-x11-xauth - xorg-x11-server-Xorg - xorg-x11-server-Xvfb - -crontab_Patching: "/usr/bin/yum -y update" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml index 188bb39603..1aab95c472 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml @@ -102,5 +102,3 @@ Test_Tool_Packages: Test_Tool_Packages_x86_64: - pulseaudio - -crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml index eca1525f0d..7404acb1d1 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml @@ -43,5 +43,3 @@ Test_Tool_Packages: - xorg - xorg-vfbserver - pulseaudio - -crontab_Patching: "/usr/sbin/pkg update && /usr/sbin/pkg upgrade -y" 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 f726107972..e2090bf124 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml @@ -98,5 +98,3 @@ Test_Tool_Packages: - 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 09699c9d3d..32bd1c2c12 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml @@ -77,5 +77,3 @@ Test_Tool_Packages: - xorg-x11-server - xorg-x11-server-extra - glibc-locale # Internationalization tests - -crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Solaris.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Solaris.yml index fb51b311b1..46a17de2a8 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Solaris.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Solaris.yml @@ -26,5 +26,3 @@ Build_Tool_Packages: Test_Tool_Packages: - perl - -crontab_Patching: "/opt/csw/bin/pkgutil --upgrade --yes" 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 6cfe9057df..7e91143b82 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml @@ -114,5 +114,3 @@ Test_Tool_Packages: Test_Tool_Packages_x86_64: - pulseaudio - -crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/openSUSE.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/openSUSE.yml index 39ddab891b..1f7dc641ab 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/openSUSE.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/openSUSE.yml @@ -65,5 +65,3 @@ Test_Tool_Packages: - xorg-x11-server - xorg-x11-server-extra - glibc-locale # Internationalization tests - -crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Crontab/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Crontab/tasks/main.yml index ec7c8c5f95..e28b91b1d0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Crontab/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Crontab/tasks/main.yml @@ -2,12 +2,33 @@ ########### # Crontab # ########### -- name: Add cron job to check for updates - cron: name="Check for updates everyday at 1am" - weekday="*" - minute="0" - hour="1" - user=root - job="{{ crontab_Patching }}" - state=present + +- name: Add cron job to apply OS updates on yum-based systems + cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present + job="/usr/bin/yum -y update" + when: (ansible_distribution == "RedHat" or ansible_distribution == "CentOS") + tags: crontab + +- name: Add cron job to apply OS updates on apt-based systems + cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present + job="/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade" + when: (ansible_distribution == "Debian" or ansible_distribution == "Ubuntu") + tags: crontab + +- name: Add cron job to apply OS updates on zypper-based systems + cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present + job="/usr/bin/zypper refresh && /usr/bin/zypper -n up" + when: (ansible_distribution == "SLES" or ansible_distribution == "openSUSE") + tags: crontab + +- name: Add cron job to apply OS updates on FreeBSD systems + cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present + job="/usr/sbin/pkg update && /usr/sbin/pkg upgrade -y" + when: (ansible_distribution == "FreeBSD") + tags: crontab + +- name: Add cron job to apply OS updates on Solaris systems + cron: name="Check for updates everyday at 1am" weekday="*" minute="0" hour="1" user=root state=present + job="/opt/csw/bin/pkgutil --upgrade --yes" + when: (ansible_distribution == "Solaris") tags: crontab diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8 index 9999084125..5a93036bf1 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8 @@ -16,7 +16,7 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh # RUN service ssh start @@ -24,4 +24,4 @@ CMD ["/usr/sbin/sshd","-D"] RUN dnf install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 index e3c5b0352d..a38f35845c 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.f33 @@ -3,7 +3,7 @@ RUN yum -y update && yum install -y perl openssh-server unzip wget RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P "" # Get java8 -RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz +RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1 # Install ant RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' @@ -16,7 +16,7 @@ # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh # RUN service ssh start @@ -24,4 +24,4 @@ RUN yum install -y git curl make gcc xorg-x11-server-Xvfb libXrender libXi libXtst procps # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 index c091da40b7..7cc36776a2 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 @@ -2,7 +2,7 @@ FROM ubuntu:16.04 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 -RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz +RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1 # Install ant RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' @@ -15,7 +15,7 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start @@ -23,4 +23,4 @@ CMD ["/usr/sbin/sshd","-D"] RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 index 9b9797f710..1a6088b6ef 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 @@ -2,7 +2,7 @@ FROM ubuntu:18.04 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 -RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz +RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1 # Install ant RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' @@ -15,7 +15,7 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start @@ -23,4 +23,4 @@ CMD ["/usr/sbin/sshd","-D"] RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 index 64234994e1..be71f84d0d 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 @@ -4,7 +4,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 -RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz +RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1 # Install ant RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' @@ -17,7 +17,7 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start @@ -25,4 +25,4 @@ CMD ["/usr/sbin/sshd","-D"] RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 index 82c39481f0..86eec5e581 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 @@ -2,7 +2,7 @@ FROM ubuntu:20.10 RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 -RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=aarch64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz +RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz RUN mkdir -p /usr/lib/jvm/jdk8 && tar -xpzf /tmp/jdk8.tar.gz -C /usr/lib/jvm/jdk8 --strip-components=1 # Install ant RUN wget -q -O /tmp/ant.zip 'https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip' @@ -15,7 +15,7 @@ RUN rm /tmp/jdk8.tar.gz /tmp/ant.zip /tmp/ant-contrib.tgz # Set up jenkins user RUN useradd -m -d /home/jenkins jenkins RUN mkdir /home/jenkins/.ssh -RUN echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAxCd3s79093JrDHyJa4/BJFP7VNfPzKz0Jb2zjN39N90DxNDJPy/asNZrBhvTY2xUdAh7o4aWjcOjUJamqeBfLrmgoXgthNje+44bWl0i/XlFc8ujcx/ya6+dtpcV0+ZiyiDGAEXfiyI+UHFv2xEmNrSNiohPIGJqXbt0BD56aVHC8n3q7hZ5H6S1ZGyWLjlfLLJQojGlAsFFwN5DOkikZCKrCp76UKHtfN39tlypTmGSQO50pKX/oN9UivPfk5EuTaHoo5oGqaqS+at1J50PKkm/danXNZdxwGDV6OK6av3LTOKt8wdBnfSynIstJJYfrRN9/ltJ6EVmPoaycwDp jenkins@ci.adoptopenjdk.net" > /home/jenkins/.ssh/authorized_keys +RUN echo "Jenkins_User_SSHKey" > /home/jenkins/.ssh/authorized_keys RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start @@ -23,4 +23,4 @@ CMD ["/usr/sbin/sshd","-D"] RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 -# Start with docker run -p 2222:22 UUID \ No newline at end of file +# Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/tasks/main.yml index e1de46ffb4..d8f37ab67b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/tasks/main.yml @@ -1,4 +1,4 @@ - +--- ################################################# # Build basic test images for each distribution # ################################################# @@ -14,46 +14,71 @@ patterns: "Dockerfile.*" register: dockerfiles +# Defaulting to x64 in Dockerfiles means no need to special case that one +# since API architecture = ansible_architecture everywhere else we use this - name: Translate architecture name in dockerfiles - replace: dest={{ item.path }} regexp="arch=aarch64" replace="arch=x64" + replace: dest={{ item.path }} regexp="arch=x64" replace="arch={{ ansible_architecture }}" + with_items: "{{ dockerfiles.files }}" + when: ansible_architecture != "x86_64" + +- name: Set jenkins authorized_Key in dockerfiles + replace: dest={{ item.path }} regexp="Jenkins_User_SSHKey" replace="{{ Jenkins_User_SSHKey }}" with_items: "{{ dockerfiles.files }}" - name: Create docker images for each distribution for test command: docker build --cpu-period=100000 --cpu-quota=800000 -t aqa_{{ item }} --memory=8G -f /tmp/Dockerfiles/Dockerfile.{{ item }} /tmp/Dockerfiles with_items: - - u1604 - - u1804 - - u2004 - - u2010 - - f33 + - u1604 + - u1804 + - u2004 + - u2010 + - f33 ############################################################## # Start the containers # # If startallcontainers is skipped, only start three of them # -# ignore_errors simplest way to ignore if alreayd started # +# ignore_errors simplest way to ignore if already started # +# # +# TODO: Check if started rather than ignore error? # +# TODO: Restart if already started? (Use galaxy role?) # +# TODO: Use a calculated value instead of 2 core/6Gb # ############################################################## -- name: Start Ubuntu 16.04 container - command: docker run -p 2222:22 --cpus=2.0 --memory=6G --detach --name U1604_2222 aqa_u1604 +- name: Start Ubuntu 16.04 container if not already started + command: docker run --restart unless-stopped -p 2222:22 --cpus=2.0 --memory=6G --detach --name U1604_2222 aqa_u1604 tags: startcontainers ignore_errors: yes -- name: Start Ubuntu 18.04 container - command: docker run -p 2223:22 --cpus=4.0 --memory=6G --detach --name U1804_2223 aqa_u1804 +- name: Start Ubuntu 18.04 container if not already started + command: docker run --restart unless-stopped -p 2223:22 --cpus=4.0 --memory=6G --detach --name U1804_2223 aqa_u1804 tags: startcontainers, startallcontainers ignore_errors: yes -- name: Start Ubuntu 20.04 container - command: docker run -p 2224:22 --cpus=2.0 --memory=6G --detach --name U2004_2224 aqa_u2004 +- name: Start Ubuntu 20.04 container if not already started + command: docker run --restart unless-stopped -p 2224:22 --cpus=2.0 --memory=6G --detach --name U2004_2224 aqa_u2004 tags: startcontainers ignore_errors: yes -- name: Start Ubuntu 20.10 container - command: docker run -p 2225:22 --cpus=4.0 --memory=6G --detach --name U2010_2225 aqa_u2010 +- name: Start Ubuntu 20.10 container if not already started + command: docker run --restart unless-stopped -p 2225:22 --cpus=4.0 --memory=6G --detach --name U2010_2225 aqa_u2010 tags: startcontainers, startallcontainers ignore_errors: yes -- name: Start fedora 33 container - command: docker run -p 2227:22 --cpus=2.0 --memory=6G --detach --name f33.2227 aqa_f33 +- name: Start fedora 33 container if not already started + command: docker run --restart unless-stopped -p 2227:22 --cpus=2.0 --memory=6G --detach --name f33.2227 aqa_f33 tags: startcontainers ignore_errors: yes + +# lineinfile does not work here - similar to the operation in /var/log in adopt_etc +# lineinfile: path /proc/sys/kernel/core_pattern state: present: regexp: . line: core.%p +# therefore the following section wil not become live prior to a reboot +# +- name: Make core file setting live immediately; + command: "echo core.%p > /proc/sys/kernel/core_pattern" + +- name: Ensure core files are able to be created within docker containers on reboot + lineinfile: + path: /etc/sysctl.conf + state: present + regexp: kernel_core_pattern + line: kernel.core_pattern=core.%p diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/tasks/main.yml index e4b1c686fa..531df1c33b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/tasks/main.yml @@ -100,8 +100,18 @@ backup: yes tags: hosts_file, adoptopenjdk +# This doesn't work as ansible says it can't write to the directory +# Leaving this here in case someoen can make it work in the future +# +#- name: Record playbook completion with time in /var/log/ansiblerun.log +# lineinfile: +# state: present +# create: yes +# path: /var/tmp/ansiblerun.log +# mode: 0644 +# line: "{{ ansible_date_time.iso8601_basic_short }} END" +# tags: ansiblerunlog + +# Version of the above that works - name: Record playbook completion with time in /var/log/ansiblerun.log - lineinfile: - dest: /var/log/ansiblerun.log - line: "{{ ansible_date_time.iso8601_basic_short }} END" - tags: ansiblerunlog + command: echo $(date +%Y%m%dT%H%M%S) >> /var/log/ansiblerun.log diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Alpine.yml deleted file mode 100644 index f7afda84ec..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Alpine.yml +++ /dev/null @@ -1,58 +0,0 @@ ---- -########## -# Alpine # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - alpine-sdk - - alsa-lib - - alsa-lib-dev - - autoconf - - bash - - bison # OpenJ9 - - cups-dev - - cups-libs - - flex # OpenJ9 - - fontconfig - - fontconfig-dev - - freetype - - freetype-dev - - grep - - libdwarf # OpenJ9 - - libdwarf-dev # OpenJ9 - - libx11 - - libx11-dev - - libxext - - libxext-dev - - libxrandr - - libxrandr-dev - - libxrender - - libxrender-dev - - libxt - - libxt-dev - - libxtst - - libxtst-dev - - linux-headers - - numactl - - numactl-dev # OpenJ9 - - unzip - - wget - - which - - xz - - zip - -Test_Tool_Packages: - - unzip - - zlib - - zlib-dev - - perl - - perl-dev - - libcurl - - curl-dev - - openssl - - openssl-dev - - mercurial - - xauth - - xorg-server - - xvfb diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/CentOS.yml deleted file mode 100644 index d7920d58e5..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/CentOS.yml +++ /dev/null @@ -1,93 +0,0 @@ ---- -########## -# CentOS # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - alsa-lib-devel - - autoconf - - bind-utils - - bison # OpenJ9 - - bzip2 - - cpio - - cups-devel - - elfutils-libelf-devel - - file - - flex # OpenJ9 - - fontconfig-devel - - freetype-devel - - gcc - - gcc-c++ - - gettext - - glibc - - glibc-common - - glibc-devel - - gmp-devel - - java-1.8.0-openjdk-devel - - libcurl-devel - - libdwarf-devel # OpenJ9 - - libpng-devel - - libXext-devel - - libXi-devel # JDK12+ compilation - - libXrandr-devel # JDK12+ compilations - - libXrender-devel - - libXt-devel - - libXtst-devel - - make - - mesa-libGL-devel - - mpfr-devel - - numactl-devel # OpenJ9 - - openssl-devel - - perl-DBI - - perl-devel - - perl-Digest-SHA - - perl-GD - - perl-libwww-perl - - perl-Time-HiRes - - systemtap-sdt-devel - - unzip - - wget - - which - - xz - - zip - -gcc48_devtoolset_compiler: - - devtoolset-2-gcc - - devtoolset-2-binutils - - devtoolset-2-gcc-c++ - -Additional_Build_Tools_CentOS7: - - libstdc++-static - -Additional_Build_Tools_CentOS8: - - glibc-locale-source - - glibc-langpack-ja # required for creating Japanese locales - - glibc-langpack-ko # required for creating Korean locales - - glibc-langpack-zh # required for creating Chinese locales - -Additional_Build_Tools_NOT_CentOS8: - - lbzip2 - - java-1.7.0-openjdk-devel - - ntp - -Additional_Build_Tools_CentOS_x86: - - glibc.i686 # a dependency required for executing a 32-bit C binary - - glibc-devel.i686 # a dependency required for executing a 32-bit C binary - - libstdc++.i686 # a dependency required for executing a 32-bit C binary - -Test_Tool_Packages: - - gcc - - gcc-c++ - - unzip - - zlib-devel - - perl-devel - - libcurl-devel - - openssl-devel - - mercurial - - perl - - xorg-x11-xauth - - xorg-x11-server-Xorg - - xorg-x11-server-Xvfb - -crontab_Patching: "/usr/bin/yum -y update" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Debian.yml deleted file mode 100644 index 188bb39603..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Debian.yml +++ /dev/null @@ -1,106 +0,0 @@ ---- -########## -# Debian # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - apt-transport-https - - autoconf - - bison # OpenJ9 - - build-essential - - cpio - - curl - - flex # OpenJ9 - - g++ - - gcc - - gettext - - libasound2-dev - - libcups2-dev - - libcurl4-openssl-dev - - libdwarf-dev # OpenJ9 - - libelf-dev - - libexpat1-dev - - libffi-dev - - libfreetype6-dev - - libfontconfig1-dev - - libgmp3-dev - - libmpfr-dev - - libmpfr-doc - - libssl-dev - - libwww-perl - - libx11-dev - - libxext-dev - - libxi-dev # JDK12+ compilation - - libxrandr-dev # JDK12+ compilation - - libxrender-dev - - libxt-dev - - libxtst-dev - - make - - ntp - - pigz - - pkg-config - - systemtap-sdt-dev - - wget - - zip - -OpenJFX_Build_Tool_Packages: - - gperf - - libavcodec-dev - - libavformat-dev - - libgl1-mesa-dev - - libgtk2.0-dev - - libgtk-3-dev - - libjpeg-dev - - libpng-dev - - libudev-dev - - libxml2-dev - - libxslt1-dev - - libxxf86vm-dev - - ruby - -gcc_7: # On all architectures but arm32 - - g++-7 # OpenJ9 - - gcc-7 # OpenJ9 - -gcc_compiler: - - g++-4.8 - - gcc-4.8 - -Additional_Packages_Debian8: - - libgstreamer0.10-dev # OpenJFX prereq - - libgstreamer-plugins-base0.10-dev # OpenJFX prereq - - openjdk-7-jdk - - adoptopenjdk-8-hotspot - - libmpfr4 - - libmpfr4-dbg - -Additional_Build_Tools_x86_64: - - libnuma-dev - - numactl - -Additional_Build_Tools_ppc64le: - - libnuma-dev - - numactl - -Additional_Build_Tools_s390x: - - numactl - - libfreetype6-dev # Needed by test state=installed - -Additional_Build_Tools_aarch64: - - libpng-dev - -Test_Tool_Packages: - - acl - - mercurial - - perl - - xauth - - xorg - - xvfb - - binfmt-support - - qemu-user-static - -Test_Tool_Packages_x86_64: - - pulseaudio - -crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/FreeBSD.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/FreeBSD.yml deleted file mode 100644 index eca1525f0d..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/FreeBSD.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -########## -# FreeBSD # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - alsa-lib - - autoconf - - bash - - cups - - fontconfig - - freetype2 - - giflib - - git - - gmake - - gtar - - jpeg-turbo - - lcms2 - - libXext - - libXi - - libX11 - - libXrandr # JDK12+ compilation - - libXrender - - libXt - - libXtst - - openjdk - - openjdk8 - - openjdk11 - - pkgconf - - png - - unzip - - wget - - zip - -gcc_compiler: - - gcc48 - -Test_Tool_Packages: - - mercurial - - perl5 - - xauth - - xorg - - xorg-vfbserver - - pulseaudio - -crontab_Patching: "/usr/sbin/pkg update && /usr/sbin/pkg upgrade -y" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/MacOSX.yml deleted file mode 100644 index 64140703ce..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/MacOSX.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -########## -# macOS # -########## - -# Command Build Tool Packages - -Build_Tool_Packages: - - autoconf - - cmake # OpenJ9 - - coreutils - - gnu-sed - - gnu-tar - - nasm # openj9 jdk13+ - - wget - -Build_Tool_Packages_NOT_arm64: - - bash # OpenJ9 needs bash v4 or later - -Build_Tool_Packages_NOT_10_12: - - ccache # ccache is no longer working on macOS 10.12 - -Build_Tool_Casks: - - adoptopenjdk10 - - packages - -Test_Tool_Packages: - - mercurial - -Test_Tool_Packages_NOT_arm64: - - pulseaudio - -Test_Tool_Casks: - - xquartz diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/RedHat.yml deleted file mode 100644 index f726107972..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/RedHat.yml +++ /dev/null @@ -1,102 +0,0 @@ ---- -########## -# RedHat # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - alsa-lib-devel - - autoconf - - bind-utils - - bison # OpenJ9 - - bzip2 - - cpio - - cups-devel - - elfutils-libelf-devel - - flex # OpenJ9 - - fontconfig-devel - - freetype-devel - - gcc - - gcc-c++ - - gettext - - glibc - - glibc-common - - glibc-devel - - gmp-devel - - libcurl-devel - - libffi-devel - - libpng-devel - - libXext-devel - - libXi-devel # JDK12+ compilation - - libXrandr-devel # JDK12+ compilation - - libXrender-devel - - libXt-devel - - libXtst-devel - - make - - mesa-libGL-devel - - mpfr-devel - - openssl-devel - - perl-devel - - pkgconfig - - systemtap-sdt-devel - - unzip - - wget - - xz - - zip - -Additional_Build_Tools_NOT_RHEL8: - - libdwarf-devel # now in CodeReady Linux Builder (CRB) repo - - libmpc-devel # now in CodeReady Linux Builder (CRB) repo - - ntp # in RHEL8, ntp package is replaced by chrony - -Additional_Build_Tools_RHEL8: - - glibc-locale-source - - glibc-langpack-ja # required for creating Japanese locales - - glibc-langpack-ko # required for creating Korean locales - - glibc-langpack-zh # required for creating Chinese locales - -Additional_Build_Tools_RHEL7: - - libstdc++-static - -Additional_Build_Tools_RHEL7_PPC64LE: - - libstdc++ - -Additional_Build_Tools_RHEL_x86: - - glibc.i686 # a dependency required for executing a 32-bit C binary - - glibc-devel.i686 # a dependency required for executing a 32-bit C binary - - libstdc++.i686 # a dependency required for executing a 32-bit C binary - -Additional_Build_Tools_RHEL_ppc64: - - glibc.ppc # a dependency required for executing a 32-bit C binary - - glibc-devel.ppc # a dependency required for executing a 32-bit C binary - - libstdc++.ppc # a dependency required for executing a 32-bit C binary - -Additional_Build_Tools_RHEL_s390x: - - glibc.s390 # a dependency required for executing a 32-bit C binary - - glibc-devel.s390 # a dependency required for executing a 32-bit C binary - - libstdc++.s390 # a dependency required for executing a 32-bit C binary - -Java_RHEL8: - - java-1.8.0-openjdk-devel - -Java_NOT_RHEL6_PPC64: # Not RHEL8 either - - java-1.7.0-openjdk-devel - - java-1.8.0-openjdk-devel - -Java_RHEL6_PPC64: - - java-1.7.0-ibm-devel - - java-1.8.0-ibm-devel - -Test_Tool_Packages: - - acl - - perl - - perl-Digest-SHA - - perl-Time-HiRes - - 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/adopt_etc/vars/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/SLES.yml deleted file mode 100644 index 09699c9d3d..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/SLES.yml +++ /dev/null @@ -1,81 +0,0 @@ ---- -######## -# SLES # -######## - -# Command Build Tool Packages -Build_Tool_Packages: - - bind-utils - - bison # OpenJ9 - - cpio - - curl - - flex - - gcc - - gcc-c++ - - glibc - - glibc-devel - - libdw1 - - libelf1 - - make - - pkg-config - - unzip - - wget - - zip - -Additional_Build_Tools_SLES15: - - alsa-devel - - cups-devel - - fontconfig-devel - - java-1_8_0-openjdk - - libcurl-devel - - libdwarf-devel - - libelf-devel - - libnuma-devel - - libX11-devel - - libXext-devel - - libXi-devel - - libXrandr-devel # JDK12+ compilation - - libXrender-devel - - libXt-devel - - libXtst-devel - - systemtap-sdt-devel - -Additional_Build_Tools_SLES12: - - java-1_8_0-openjdk - - git-core - - libelf0 - - libfreetype6 - - libXext6 - - libXi6 # JDK12+ compilation - - libXrandr2 # JDK12+ compilation - - libXrender1 - - libXt6 - - libXtst6 - - Mesa-libGL1 - - ntp - - perl-CPAN-Meta -Additional_Build_Tools_SLES11: - - perl-Error - - libelf0 - - libwww-perl - - ntp - -Additional_Build_Tools_SLES_x86: - - glibc-32bit # a dependency required for executing a 32-bit C binary - - glibc-devel-32bit # a dependency required for executing a 32-bit C binary - - libstdc++6-32bit # a dependency required for executing a 32-bit C binary - - libelf0-32bit # a dependency required for executing a 32-bit C binary - - libelf0-debuginfo-32bit # a dependency required for executing a 32-bit C binary - - libstdc++-devel-32bit # a dependency required for executing a 32-bit C binary - - libXtst6-32bit # a dependency required for executing a 32-bit C binary - -Test_Tool_Packages: - - gcc - - gcc-c++ - - perl - - xorg-x11 - - xorg-x11-server - - xorg-x11-server-extra - - glibc-locale # Internationalization tests - -crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Solaris.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Solaris.yml deleted file mode 100644 index fb51b311b1..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Solaris.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -########### -# Solaris # -########### - -# Command Build Tool Packages -Build_Tool_Packages: - - autoconf - - binutils - - coreutils - - ccache - - ggrep - - jdk7 - - jdk8 - - pigz - - git - - sudo - - nano - - ntp - - wget - - curl - - freetype - - gmake - - gtar - - xz - -Test_Tool_Packages: - - perl - -crontab_Patching: "/opt/csw/bin/pkgutil --upgrade --yes" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Ubuntu.yml deleted file mode 100644 index 6cfe9057df..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/Ubuntu.yml +++ /dev/null @@ -1,118 +0,0 @@ ---- -########## -# Ubuntu # -########## - -# Command Build Tool Packages -Build_Tool_Packages: - - apt-transport-https - - autoconf - - bison # OpenJ9 - - build-essential - - cpio - - curl - - flex # Openj9 - - g++ - - gcc - - gettext - - libasound2-dev - - libcups2-dev - - libcurl4-openssl-dev - - libdwarf-dev # OpenJ9 - - libelf-dev - - libexpat1-dev - - libffi-dev - - libfreetype6-dev - - libfontconfig1-dev - - libgmp3-dev - - libmpfr-dev - - libmpfr-doc - - libssl-dev - - libwww-perl - - libx11-dev - - libxext-dev - - libxi-dev # JDK12+ compilation - - libxrandr-dev # JDK12+ compilation - - libxrender-dev - - libxt-dev - - libxtst-dev - - make - - ntp - - openjdk-8-jdk - - pigz - - pkg-config - - systemtap-sdt-dev - - wget - - zip - -OpenJFX_Build_Tool_Packages: - - gperf - - libavcodec-dev - - libavformat-dev - - libgl1-mesa-dev - - libgtk2.0-dev - - libgtk-3-dev - - libjpeg-dev - - libpng-dev - - libudev-dev - - libxml2-dev - - libxslt1-dev - - libxxf86vm-dev - - ruby - -gcc_compiler: - - g++-4.8 - - gcc-4.8 - -Additional_Packages_Ubuntu16: - - xserver-xorg-legacy # Not actually sure if this is still needed - - libgstreamer0.10-dev # OpenJFX prereq - - libgstreamer-plugins-base0.10-dev # OpenJFX prereq - - openjdk-7-jdk - - openjdk-8-jdk - - libmpfr4 - - libmpfr4-dbg - -Additional_Packages_Ubuntu18: - - libgstreamer1.0-dev # OpenJFX prereq - - libgstreamer-plugins-base1.0-dev # OpenJFX prereq - -Additional_Build_Tools_x86: - - libnuma-dev - - numactl - - gcc-7 - - g++-7 - - gcc-multilib # a dependency required for executing a 32-bit C binary - -Additional_Build_Tools_ppc64le: - - libnuma-dev - - numactl - - gcc-7 # OpenJ9 - - g++-7 # OpenJ9 - -Additional_Build_Tools_s390x: - - gcc-7 # OpenJ9 - - g++-7 # OpenJ9 - - numactl - - libfreetype6-dev # Needed by test state=installed - -Additional_Build_Tools_aarch64: - - libpng-dev - -Test_Tool_Packages: - - acl - - mercurial - - perl - - xauth - - xorg - - xvfb - - binfmt-support - - qemu-user-static - - unzip - - libexpat1-dev - - libcurl4-openssl-dev - -Test_Tool_Packages_x86_64: - - pulseaudio - -crontab_Patching: "/usr/bin/apt-get update && /usr/bin/apt-get -y upgrade" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/openSUSE.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/openSUSE.yml deleted file mode 100644 index 39ddab891b..0000000000 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adopt_etc/vars/openSUSE.yml +++ /dev/null @@ -1,69 +0,0 @@ ---- -######## -# SUSE # -######## - -# Command Build Tool Packages -Build_Tool_Packages: - - alsa-devel - - autoconf - - bind-utils - - bison # OpenJ9 - - cpio - - curl - - cups - - cups-devel - - flex - - gcc - - gcc-c++ - - glibc - - glibc-devel - - libcurl-devel - - libdw1 - - libdwarf-devel - - libelf-devel - - libelf0 - - libelf1 - - libnuma-devel - - libpng15-devel - - libXext-devel - - libXi-devel - - libXrandr-devel - - libXrender-devel - - libXt-devel - - libXtst-devel - - make - - ntp - - numactl - - pkg-config - - systemtap-sdt-devel - - unzip - - wget - - zip - - zlib-devel - -Additional_Build_Tools_SUSE12: - - git-core - - libfreetype6 - - libXext6 - - libXi6 # JDK12+ compilation - - libXrandr2 # JDK12+ compilation - - libXrender1 - - libXt6 - - libXtst6 - - Mesa-libGL1 - -Additional_Build_Tools_SUSE_x86: - - glibc-32bit # a dependency required for executing a 32-bit C binary - - glibc-devel-32bit # a dependency required for executing a 32-bit C binary - -Test_Tool_Packages: - - perl - - pulseaudio - - xorg-x11 - - xorg-x11-devel - - xorg-x11-server - - xorg-x11-server-extra - - glibc-locale # Internationalization tests - -crontab_Patching: "/usr/bin/zypper refresh && /usr/bin/zypper -n up"