Disable the reproduce_compare jobs now aqa-test Rebuild_Same_JDK_Repr…

…oducibility_Test_0 running (#1093) * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> * default reproducibleCompare to False Signed-off-by: Andrew Leonard <[email protected]> --------- Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Sep 4, 2024 · 4bfdbb6 · 4bfdbb6
1 parent d33d46f
commit 4bfdbb6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 43 deletions.
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
@@ -127,7 +127,12 @@ class Builder implements Serializable {
         if (additionalBuildArgs) {
             buildArgs += ' ' + additionalBuildArgs
         }
-        def enableReproducibleCompare = isEnableReproducibleCompare(platformConfig, variant)
+
+        if (enableReproducibleCompare) {
+            // Pipeline parameter "enableReproducibleCompare" requests reproducibleCompare if enabled for this platform
+            enableReproducibleCompare = isEnableReproducibleCompare(platformConfig, variant)
+        }
+
         def testList = getTestList(platformConfig, variant)
 
         def dynamicTestsParameters = getDynamicParams(platformConfig, variant)

diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -9,9 +9,6 @@ class Config17 {
                         openj9      : '!sw.os.osx.10_11'
                 ],
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
@@ -31,9 +28,6 @@ class Config17 {
                 test: [
                         weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'sanity.external', 'dev.openjdk', 'dev.functional']
                 ],
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 additionalTestLabels: [
                         openj9      : '!(centos6||rhel6)'
                 ],
@@ -76,9 +70,6 @@ class Config17 {
                 arch                : 'x64',
                 additionalNodeLabels: 'win2022&&vs2019',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x64'",
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
@@ -113,9 +104,6 @@ class Config17 {
                 arch                : 's390x',
                 dockerImage         : 'rhel7_build_image',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -127,9 +115,6 @@ class Config17 {
                 arch                : 'ppc64le',
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
                 ]
@@ -144,9 +129,6 @@ class Config17 {
                         'openj9'    : '--enable-dtrace',
                         'temurin'   : '--enable-dtrace --with-jobs=4'
                 ],
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
                 ]
@@ -158,9 +140,6 @@ class Config17 {
                 arch                : 'aarch64',
                 additionalNodeLabels: 'xcode15.0.1',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
                 ]

diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -9,9 +9,6 @@ class Config21 {
                         openj9      : '!sw.os.osx.10_11'
                 ],
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : '--enable-dtrace',
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
@@ -28,9 +25,6 @@ class Config21 {
                 test: [
                         weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'sanity.external', 'dev.openjdk', 'dev.functional', 'dev.system', 'special.system']
                 ],
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 additionalTestLabels: [
                         openj9      : '!(centos6||rhel6)',
                         temurin     : '!(centos6||rhel6)'
@@ -76,9 +70,6 @@ class Config21 {
                 test: [
                         weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system']
                 ],
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'",
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
@@ -107,9 +98,6 @@ class Config21 {
                 arch                : 's390x',
                 dockerImage         : 'rhel7_build_image',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
                 ]
@@ -120,9 +108,6 @@ class Config21 {
                 arch                : 'ppc64le',
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : [
                         'openj9'      : '--enable-dtrace'
                 ],
@@ -136,9 +121,6 @@ class Config21 {
                 arch                : 'aarch64',
                 dockerImage         : 'adoptopenjdk/centos7_build_image',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
                         'temurin'   : '--enable-dtrace --with-jobs=4'
@@ -153,9 +135,6 @@ class Config21 {
                 arch                : 'aarch64',
                 additionalNodeLabels: 'xcode15.0.1',
                 test                : 'default',
-                reproducibleCompare : [
-                        'temurin'   : true
-                ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom'
                 ]