From 722dd6a0abcc1bde1a344118e6e05b6db2a6971c Mon Sep 17 00:00:00 2001
From: AdamBrousseau <adam.brousseau88@gmail.com>
Date: Tue, 6 Jun 2023 12:07:15 -0400
Subject: [PATCH] OpenJ9: Remove explicit jitserver enable option (#710)

Is enabled by default on x/p/z linux in all versions
Related ibmruntimes/ci-jenkins-pipelines#132

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
---
 pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 4 ++--
 pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 4 ++--
 pipelines/jobs/configurations/jdk20u_pipeline_config.groovy | 4 ++--
 pipelines/jobs/configurations/jdk21_pipeline_config.groovy  | 4 ++--
 pipelines/jobs/configurations/jdk8u_pipeline_config.groovy  | 4 ----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
index 0dbb11177..4f57dd1b9 100644
--- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -27,7 +27,7 @@ class Config11 {
                         weekly : ['extended.openjdk', 'extended.perf', 'special.functional', 'sanity.external']
                 ],
                 configureArgs       : [
-                        'openj9'      : '--enable-jitserver --enable-dtrace=auto',
+                        'openj9'      : '--enable-dtrace=auto',
                         'temurin'     : '--enable-dtrace=auto',
                         'corretto'    : '--enable-dtrace=auto',
                         'SapMachine'  : '--enable-dtrace=auto',
@@ -126,7 +126,7 @@ class Config11 {
                 test                : 'default',
                 configureArgs       : [
                         'temurin'     : '--enable-dtrace=auto',
-                        'openj9'      : '--enable-dtrace=auto --enable-jitserver'
+                        'openj9'      : '--enable-dtrace=auto'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom'
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
index 16e1d2873..1e2bc42d4 100644
--- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -30,7 +30,7 @@ class Config17 {
                         openj9      : '!(centos6||rhel6)'
                 ],
                 configureArgs       : [
-                        'openj9'    : '--enable-dtrace --enable-jitserver',
+                        'openj9'    : '--enable-dtrace',
                         'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
@@ -109,7 +109,7 @@ class Config17 {
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
                 configureArgs       : [
-                        'openj9'      : '--enable-dtrace --enable-jitserver'
+                        'openj9'      : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
index b9a480a65..7da7f59a9 100644
--- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -27,7 +27,7 @@ class Config20 {
                         openj9      : '!(centos6||rhel6)'
                 ],
                 configureArgs       : [
-                        'openj9'    : '--enable-dtrace --enable-jitserver',
+                        'openj9'    : '--enable-dtrace',
                         'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
@@ -102,7 +102,7 @@ class Config20 {
                 test                : 'default',
                 configureArgs       : [
                         'temurin'     : '--enable-dtrace',
-                        'openj9'      : '--enable-dtrace --enable-jitserver'
+                        'openj9'      : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
diff --git a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
index d24bdbd02..982bf9a18 100644
--- a/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk21_pipeline_config.groovy
@@ -27,7 +27,7 @@ class Config21 {
                         openj9      : '!(centos6||rhel6)'
                 ],
                 configureArgs       : [
-                        'openj9'    : '--enable-dtrace --enable-jitserver',
+                        'openj9'    : '--enable-dtrace',
                         'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
@@ -100,7 +100,7 @@ class Config21 {
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
                 configureArgs       : [
-                        'openj9'      : '--enable-dtrace --enable-jitserver'
+                        'openj9'      : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
index 2b0bb3ccd..b8276175e 100644
--- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
+++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -25,7 +25,6 @@ class Config8 {
                 ],
                 test                 : 'default',
                 configureArgs       : [
-                        'openj9'      : '--enable-jitserver',
                         'dragonwell'  : '--enable-unlimited-crypto --with-jvm-variants=server  --with-zlib=system',
                 ],
                 buildArgs           : [
@@ -123,9 +122,6 @@ class Config8 {
                 arch: 'ppc64le',
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
-                configureArgs       : [
-                        'openj9'      : '--enable-jitserver'
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom'
                 ]