From f0170fbeef969f3eb0183d3edd2f0f0f4f5fbd21 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 7 Jan 2022 12:04:01 +0000 Subject: [PATCH 1/4] unixPB: Install gcc 10.3 into /usr/local/gcc10 Signed-off-by: Stewart X Addison --- .../AdoptOpenJDK_Unix_Playbook/main.yml | 6 ++- .../roles/gcc_10/tasks/main.yml | 42 +++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 74faf901f5..56f41cceba 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -59,7 +59,9 @@ - gcc_48 - role: gcc_7 # OpenJ9 tags: [build_tools, build_tools_openj9] - - role: gcc_9 + - role: gcc_9 # Dragonwell + tags: [build_tools] + - role: gcc_10 # JDK17+ tags: [build_tools] - role: Xcode when: ansible_distribution == "MacOSX" @@ -109,7 +111,7 @@ - ansible_distribution != "Solaris" - ansible_architecture != "riscv64" tags: build_tools - - role: adoptopenjdk_install # JDK18 Build Bootstrap + - role: adoptopenjdk_install # JDK18 Build Bootstrap jdk_version: 17 when: - ansible_distribution != "Alpine" diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml new file mode 100644 index 0000000000..27b9286f80 --- /dev/null +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml @@ -0,0 +1,42 @@ +--- +########## +# gcc_10 # +########## + +- name: Check if gcc 10.3 is installed on RHEL/CentOS/Ubuntu16 + shell: /usr/local/gcc10/bin/gcc-10.3 --version 2>&1 > /dev/null + ignore_errors: yes + register: gcc10_installed + when: ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "openSUSE" or (ansible_architecture == "armv7l" and ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or ansible_distribution == "Debian")) + tags: gcc_10 + +# Unable to check the checksum of the binary as it'll be different for each architecture's tar.xz file +- name: Download AdoptOpenJDK gcc-10.3 binary + get_url: + url: https://ci.adoptopenjdk.net/userContent/gcc/gcc103.{{ ansible_architecture }}.tar.xz + dest: '/tmp/ansible-adoptopenjdk-gcc-10.tar.xz' + force: no + mode: 0644 + when: + - ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "openSUSE" or (ansible_architecture == "armv7l" and ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or ansible_distribution == "Debian")) + - gcc10_installed.rc != 0 + tags: gcc_10 + +- name: Extract AdoptOpenJDK gcc-10 binary to /usr/local/gcc10 + unarchive: + src: /tmp/ansible-adoptopenjdk-gcc-10.tar.xz + dest: /usr/local/ + copy: False + when: + - ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "openSUSE" or (ansible_architecture == "armv7l" and ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or ansible_distribution == "Debian")) + - gcc10_installed.rc != 0 + tags: gcc_10 + +- name: Remove downloaded gcc 10 binary tarball + file: + path: '/tmp/ansible-adoptopenjdk-gcc-10.tar.xz' + state: absent + when: + - ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "openSUSE" or (ansible_architecture == "armv7l" and ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or ansible_distribution == "Debian")) + - gcc10_installed.rc != 0 + tags: gcc_10 From 8a2584a38fe77a08261ea2d819d9937d45d8e663 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 10 Jan 2022 10:59:53 +0000 Subject: [PATCH 2/4] Add changed_when;False to gcc_10 role Signed-off-by: Stewart X Addison --- .../AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml index 27b9286f80..46d39e2f49 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_10/tasks/main.yml @@ -8,6 +8,7 @@ ignore_errors: yes register: gcc10_installed when: ansible_distribution == "RedHat" or ansible_distribution == "CentOS" or ansible_distribution == "openSUSE" or (ansible_architecture == "armv7l" and ((ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or ansible_distribution == "Debian")) + changed_when: False tags: gcc_10 # Unable to check the checksum of the binary as it'll be different for each architecture's tar.xz file From bd19256345b54bc29579231f0321b618d02a496e Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 10 Jan 2022 14:04:58 +0000 Subject: [PATCH 3/4] Ensure we don't pick up static-libs instead of JDK for testing --- ansible/pbTestScripts/testJDK.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/pbTestScripts/testJDK.sh b/ansible/pbTestScripts/testJDK.sh index 0ebf96c542..9458ab80b0 100755 --- a/ansible/pbTestScripts/testJDK.sh +++ b/ansible/pbTestScripts/testJDK.sh @@ -6,9 +6,12 @@ if [[ $(uname) == "FreeBSD" ]]; then cp -r $HOME/openjdk-build/workspace/build/src/build/*/jdk* $HOME export TEST_JDK_HOME=$HOME/jdk else - export TEST_JDK_HOME=$(find $HOME/openjdk-build/workspace/build/src/build/*/images/ -maxdepth 1 -type d -name "jdk*"|grep -v ".*jre.*"|grep -v ".*-image") + ls -ld $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* + export TEST_JDK_HOME=$(ls -1d $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* |egrep -v 'jre|-image|static-libs' fi +echo DEBUG: TEST_JDK_HOME = $TEST_JDK_HOME + mkdir -p $HOME/testLocation [ ! -d $HOME/testLocation/aqa-tests ] && git clone https://github.com/adoptium/aqa-tests.git $HOME/testLocation/aqa-tests # cd to aqa-tests as required by https://github.com/adoptium/aqa-tests/issues/2691#issue-932959102 From 8e285d191f40325e21592ab188f0b33a53c691ea Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 10 Jan 2022 23:55:07 +0000 Subject: [PATCH 4/4] Fix syntax error --- ansible/pbTestScripts/testJDK.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/pbTestScripts/testJDK.sh b/ansible/pbTestScripts/testJDK.sh index d15c3c7d7a..63410b5e38 100755 --- a/ansible/pbTestScripts/testJDK.sh +++ b/ansible/pbTestScripts/testJDK.sh @@ -7,7 +7,7 @@ if [[ "$(uname)" == "FreeBSD" ]]; then export TEST_JDK_HOME=$HOME/jdk else ls -ld $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* - export TEST_JDK_HOME=$(ls -1d $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* |egrep -v 'jre|-image|static-libs' + export TEST_JDK_HOME=$(ls -1d $HOME/openjdk-build/workspace/build/src/build/*/images/jdk* |egrep -v 'jre|-image|static-libs') fi echo DEBUG: TEST_JDK_HOME = $TEST_JDK_HOME