From 16edb851984f456163222071d3097686e9b4a762 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 21 Apr 2021 11:39:56 +1000 Subject: [PATCH 1/5] DCD-986: Use AdoptOpenJDK for Bitbucket. --- aws_bitbucket_dc_node.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 96c19d8..6b4f23f 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -10,6 +10,10 @@ atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" + atl_use_system_jdk: true + java_major_version: "11" # BB 8 will drop JDK 8 support + atl_download_format: "tarball" + atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared" atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared" atl_nfs_version: "3" From f0813d84931a9838fe741d459d37d004e0ad2d91 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 21 Apr 2021 11:53:44 +1000 Subject: [PATCH 2/5] DCD-986: Use AdoptOpenJDK for Jira. --- aws_jira_dc_node.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml index 1a40591..9435a64 100644 --- a/aws_jira_dc_node.yml +++ b/aws_jira_dc_node.yml @@ -10,6 +10,10 @@ atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') | bool }}" atl_systemd_service_name: "jira.service" + atl_use_system_jdk: true + java_major_version: "11" + atl_download_format: "tarball" + atl_startup_systemd_params: - "LimitNOFILE=16384" From 2b20d8e12cd3e9199d13e1b36b8a0f3b0e460f49 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 21 Apr 2021 12:27:38 +1000 Subject: [PATCH 3/5] DCD-986: Set JAVA_HOME for Bitbucket. --- aws_bitbucket_dc_node.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 6b4f23f..d0eecba 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -22,6 +22,7 @@ - "UMask=0027" - "LimitNOFILE=4096" - "Environment=BITBUCKET_HOME={{ atl_product_home }}" + - "Environment=JAVA_HOME=/usr/lib/jvm/java" - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}" - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}" - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}" From 72773747ec1b0bfc54cfda37790449e24f21852b Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 21 Apr 2021 12:56:52 +1000 Subject: [PATCH 4/5] DCD-986: Continue to use JDK 8 with Jira for the time being. --- aws_jira_dc_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml index 9435a64..e28a29d 100644 --- a/aws_jira_dc_node.yml +++ b/aws_jira_dc_node.yml @@ -11,7 +11,7 @@ atl_systemd_service_name: "jira.service" atl_use_system_jdk: true - java_major_version: "11" + java_major_version: "8" atl_download_format: "tarball" atl_startup_systemd_params: From e19caa4b485c2692d6a75e7b6e78ae2d3c778470 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 21 Apr 2021 13:31:55 +1000 Subject: [PATCH 5/5] DCD-986: Use AdoptOpenJDK with Confluence. --- aws_confluence_dc_node.yml | 4 ++++ aws_confluence_synchrony_node.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml index 046657c..3823305 100644 --- a/aws_confluence_dc_node.yml +++ b/aws_confluence_dc_node.yml @@ -8,6 +8,10 @@ atl_product_user: "confluence" atl_product_edition: "confluence" + atl_use_system_jdk: true + java_major_version: "8" + atl_download_format: "tarball" + atl_jdbc_encoding: 'UTF-8' atl_jdbc_collation: 'en_US.UTF-8' diff --git a/aws_confluence_synchrony_node.yml b/aws_confluence_synchrony_node.yml index b0fd8f2..f7750fc 100644 --- a/aws_confluence_synchrony_node.yml +++ b/aws_confluence_synchrony_node.yml @@ -9,6 +9,10 @@ atl_product_user: "confluence" atl_product_edition: "confluence" + atl_use_system_jdk: true + java_major_version: "8" + atl_download_format: "tarball" + atl_startup_systemd_params: - "EnvironmentFile=/etc/atl" - "EnvironmentFile=/etc/atl.synchrony"