From e8783d0daf72ee12fa257f5942828c595d366db9 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 25 Nov 2025 17:15:26 +0000 Subject: [PATCH 1/3] Remove Liberica install as we don't directly connect jenkins to Solaris now Signed-off-by: Stewart X Addison --- .../roles/Common/tasks/Solaris.yml | 172 +++++++++--------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml index 3cec1f7b1d..2cd95dcd8f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml @@ -369,89 +369,89 @@ - ansible_architecture == "i386" tags: build_tools -- name: Check if Liberica 11 is already installed in the target location - stat: path=/usr/lib/jvm/jdk-11/bin/java - register: liberica11_installed - tags: build_tools - -- name: Download Liberica 11.0.18+10 (SPARC) - get_url: - url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-sparcv9.tar.gz - dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz - force: no - mode: 0755 - checksum: sha1:4cba710351022cbfe5e8f90c919ed93e9a0292c0 - when: - - ansible_architecture == "sun4v" - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Download Liberica 11.0.18+10 (x64) - get_url: - url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-x64.tar.gz - dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz - force: no - mode: 0755 - checksum: sha1:e93ae23bff63e108ebafb16065d5b408a3ce6f22 - when: - - ansible_architecture == "i386" - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Creating /usr/lib/jvm/bell-jdk-11.0.18.tmp for temporary use - file: - path: /usr/lib/jvm/bell-jdk-11.0.18.tmp - state: directory - owner: root - mode: 0755 - when: - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Decompress Liberica 11 - unarchive: - src: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz - dest: /usr/lib/jvm/bell-jdk-11.0.18.tmp - remote_src: yes - when: - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Remove top level of directory - command: mv /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 /usr/lib/jvm/bell-jdk-11.0.18 - args: - removes: /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 - creates: /usr/lib/jvm/bell-jdk-11.0.18/bin/java - when: - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Clear temp directory - file: - path: /usr/lib/jvm/bell-jdk-11.0.18.tmp - state: absent - when: - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Create symlink to point at Liberica 11 - file: - src: /usr/lib/jvm/bell-jdk-11.0.18 - dest: /usr/lib/jvm/jdk-11 - state: link - when: - - not liberica11_installed.stat.exists - tags: build_tools - -- name: Check for /usr/lib/jvm/fallocate.so - stat: - path: /usr/lib/jvm/fallocate.so - register: fallocate_installed - -- name: Copy fallocate.so into place for JDK11 - copy: - src: files/{{ ansible_architecture }}/fallocate.so - dest: /usr/lib/jvm/fallocate.so - when: - - not fallocate_installed.stat.exists - tags: build_tools +#- name: Check if Liberica 11 is already installed in the target location +# stat: path=/usr/lib/jvm/jdk-11/bin/java +# register: liberica11_installed +# tags: build_tools + +#- name: Download Liberica 11.0.18+10 (SPARC) +# get_url: +# url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-sparcv9.tar.gz +# dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz +# force: no +# mode: 0755 +# checksum: sha1:4cba710351022cbfe5e8f90c919ed93e9a0292c0 +# when: +# - ansible_architecture == "sun4v" +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Download Liberica 11.0.18+10 (x64) +# get_url: +# url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-x64.tar.gz +# dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz +# force: no +# mode: 0755 +# checksum: sha1:e93ae23bff63e108ebafb16065d5b408a3ce6f22 +# when: +# - ansible_architecture == "i386" +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Creating /usr/lib/jvm/bell-jdk-11.0.18.tmp for temporary use +# file: +# path: /usr/lib/jvm/bell-jdk-11.0.18.tmp +# state: directory +# owner: root +# mode: 0755 +# when: +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Decompress Liberica 11 +# unarchive: +# src: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz +# dest: /usr/lib/jvm/bell-jdk-11.0.18.tmp +# remote_src: yes +# when: +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Remove top level of directory +# command: mv /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 /usr/lib/jvm/bell-jdk-11.0.18 +# args: +# removes: /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 +# creates: /usr/lib/jvm/bell-jdk-11.0.18/bin/java +# when: +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Clear temp directory +# file: +# path: /usr/lib/jvm/bell-jdk-11.0.18.tmp +# state: absent +# when: +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Create symlink to point at Liberica 11 +# file: +# src: /usr/lib/jvm/bell-jdk-11.0.18 +# dest: /usr/lib/jvm/jdk-11 +# state: link +# when: +# - not liberica11_installed.stat.exists +# tags: build_tools +# +#- name: Check for /usr/lib/jvm/fallocate.so +# stat: +# path: /usr/lib/jvm/fallocate.so +# register: fallocate_installed +# +#- name: Copy fallocate.so into place for JDK11 +# copy: +# src: files/{{ ansible_architecture }}/fallocate.so +# dest: /usr/lib/jvm/fallocate.so +# when: +# - not fallocate_installed.stat.exists +# tags: build_tools From f3262bcee9c341a71e9200dd4b07b51c205e0b1b Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 1 Dec 2025 10:47:18 +0000 Subject: [PATCH 2/3] Remove commented out Liberica 11 install code Signed-off-by: Stewart X Addison --- .../roles/Common/tasks/Solaris.yml | 91 +------------------ 1 file changed, 5 insertions(+), 86 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml index 2cd95dcd8f..96ea83bf8b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml @@ -369,89 +369,8 @@ - ansible_architecture == "i386" tags: build_tools -#- name: Check if Liberica 11 is already installed in the target location -# stat: path=/usr/lib/jvm/jdk-11/bin/java -# register: liberica11_installed -# tags: build_tools - -#- name: Download Liberica 11.0.18+10 (SPARC) -# get_url: -# url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-sparcv9.tar.gz -# dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz -# force: no -# mode: 0755 -# checksum: sha1:4cba710351022cbfe5e8f90c919ed93e9a0292c0 -# when: -# - ansible_architecture == "sun4v" -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Download Liberica 11.0.18+10 (x64) -# get_url: -# url: https://download.bell-sw.com/java/11.0.18+10/bellsoft-jdk11.0.18+10-solaris-x64.tar.gz -# dest: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz -# force: no -# mode: 0755 -# checksum: sha1:e93ae23bff63e108ebafb16065d5b408a3ce6f22 -# when: -# - ansible_architecture == "i386" -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Creating /usr/lib/jvm/bell-jdk-11.0.18.tmp for temporary use -# file: -# path: /usr/lib/jvm/bell-jdk-11.0.18.tmp -# state: directory -# owner: root -# mode: 0755 -# when: -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Decompress Liberica 11 -# unarchive: -# src: /tmp/bellsoft-jdk11.0.18+10-solaris.tar.gz -# dest: /usr/lib/jvm/bell-jdk-11.0.18.tmp -# remote_src: yes -# when: -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Remove top level of directory -# command: mv /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 /usr/lib/jvm/bell-jdk-11.0.18 -# args: -# removes: /usr/lib/jvm/bell-jdk-11.0.18.tmp/jdk-11.0.18 -# creates: /usr/lib/jvm/bell-jdk-11.0.18/bin/java -# when: -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Clear temp directory -# file: -# path: /usr/lib/jvm/bell-jdk-11.0.18.tmp -# state: absent -# when: -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Create symlink to point at Liberica 11 -# file: -# src: /usr/lib/jvm/bell-jdk-11.0.18 -# dest: /usr/lib/jvm/jdk-11 -# state: link -# when: -# - not liberica11_installed.stat.exists -# tags: build_tools -# -#- name: Check for /usr/lib/jvm/fallocate.so -# stat: -# path: /usr/lib/jvm/fallocate.so -# register: fallocate_installed -# -#- name: Copy fallocate.so into place for JDK11 -# copy: -# src: files/{{ ansible_architecture }}/fallocate.so -# dest: /usr/lib/jvm/fallocate.so -# when: -# - not fallocate_installed.stat.exists -# tags: build_tools + +# Liberica 11 install with a custom patch to make it work on Solaris 11 +# used to be here for jenkins until they moved to requiring java 17 +# Certificate check on the 11 download no longer works so it has been +# removed under https://github.com/adoptium/infrastructure/pull/4156 \ No newline at end of file From cd558cce368e5c3b8d626ab126ea47ed14aa24a4 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 1 Dec 2025 10:48:25 +0000 Subject: [PATCH 3/3] add newline at end of file Signed-off-by: Stewart X Addison --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml index 96ea83bf8b..27aa3ac782 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Solaris.yml @@ -373,4 +373,4 @@ # Liberica 11 install with a custom patch to make it work on Solaris 11 # used to be here for jenkins until they moved to requiring java 17 # Certificate check on the 11 download no longer works so it has been -# removed under https://github.com/adoptium/infrastructure/pull/4156 \ No newline at end of file +# removed under https://github.com/adoptium/infrastructure/pull/4156