Enable SBOM strace for all Linux platforms

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
adoptium · Jul 4, 2024 · 8107467 · 8107467
1 parent b019b42
commit 8107467
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -60,7 +60,7 @@ class Config11 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --disable-ccache --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes --disable-ccache'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom --enable-sbom-strace'
@@ -174,7 +174,7 @@ class Config11 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace=auto',
-                        'temurin'   : '--enable-dtrace=auto --disable-ccache --with-jobs=4'
+                        'temurin'   : '--enable-dtrace=auto --disable-ccache'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom --enable-sbom-strace'
@@ -193,7 +193,7 @@ class Config11 {
                         dragonwell: 'armv8.2'
                 ],
                 configureArgs       : [
-                        'temurin'   : '--enable-dtrace=auto --disable-ccache --with-jobs=4',
+                        'temurin'   : '--enable-dtrace=auto --disable-ccache',
                         'openj9'    : '--enable-dtrace=auto',
                         'corretto'  : '--enable-dtrace=auto',
                         'dragonwell': "--enable-dtrace=auto --with-extra-cflags=\"-march=armv8.2-a+crypto\" --with-extra-cxxflags=\"-march=armv8.2-a+crypto\"",

diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -64,7 +64,7 @@ class Config17 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -142,7 +142,7 @@ class Config17 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],
                 reproducibleCompare : [
                         'temurin'   : true
@@ -176,7 +176,7 @@ class Config17 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'

diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -62,7 +62,7 @@ class Config21 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -141,7 +141,7 @@ class Config21 {
                 ],
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'

diff --git a/pipelines/jobs/configurations/jdk22u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22u_pipeline_config.groovy
@@ -57,7 +57,7 @@ class Config22 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes'
                 ],  
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -124,7 +124,7 @@ class Config22 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],  
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'

diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
@@ -57,7 +57,7 @@ class Config23 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes'
                 ], 
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -124,7 +124,7 @@ class Config23 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'

diff --git a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy
@@ -57,7 +57,7 @@ class Config24 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-headless-only=yes',
-                        'temurin'   : '--enable-headless-only=yes --with-jobs=4'
+                        'temurin'   : '--enable-headless-only=yes'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace'
@@ -124,7 +124,7 @@ class Config24 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--enable-dtrace',
-                        'temurin'   : '--enable-dtrace --with-jobs=4'
+                        'temurin'   : '--enable-dtrace'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'

diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
@@ -58,7 +58,7 @@ class Config8 {
                 test                : 'default',
                 configureArgs       : [
                         'openj9'    : '--disable-headful',
-                        'temurin'   : '--disable-headful --disable-ccache --with-jobs=4'
+                        'temurin'   : '--disable-headful --disable-ccache'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom --enable-sbom-strace'
@@ -167,7 +167,7 @@ class Config8 {
                 dockerArgs: '--platform linux/arm/v7',
                 test: 'default',
                 configureArgs       : [ 
-                        'temurin'   : '--disable-ccache --with-jobs=4'
+                        'temurin'   : '--disable-ccache'
                 ],    
                 buildArgs           : [
                         'temurin'   : '--create-sbom --enable-sbom-strace'
@@ -183,7 +183,7 @@ class Config8 {
                 ],
                 test                 : 'default',
                 configureArgs       : [
-                        'temurin'   : '--disable-ccache --with-jobs=4'
+                        'temurin'   : '--disable-ccache'
                 ],
                 buildArgs           : [
                         'temurin'   : '--create-sbom --enable-sbom-strace'