Skip to content

Commit

Permalink
feat: enable --create-sbom on jdk8/11/17/18/19 per each config
Browse files Browse the repository at this point in the history
  • Loading branch information
@zdtsw
zdtsw committed May 12, 2022
1 parent 10eecb6 commit c01efad
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 44 deletions.
6 changes: 3 additions & 3 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Config11 {
"bisheng" : '--enable-dtrace=auto --with-extra-cflags=-fstack-protector-strong --with-extra-cxxflags=-fstack-protector-strong --with-jvm-variants=server --disable-warnings-as-errors'
],
buildArgs : [
"temurin" : '--create-source-archive'
"temurin" : '--create-source-archive --create-sbom'
]
],

Expand All @@ -52,7 +52,7 @@ class Config11 {
dragonwell: 'win2012'
],
buildArgs : [
temurin : '--jvm-variant client,server'
temurin : '--jvm-variant client,server --create-sbom'
],
test : 'default'
],
Expand All @@ -71,7 +71,7 @@ class Config11 {
arch : 'x86-32',
additionalNodeLabels: 'win2012',
buildArgs : [
temurin : '--jvm-variant client,server'
temurin : '--jvm-variant client,server --create-sbom'
],
test : 'default'
],
Expand Down
24 changes: 12 additions & 12 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Config17 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -33,7 +33,7 @@ class Config17 {
"temurin" : '--enable-dtrace'
],
buildArgs : [
"temurin" : '--create-source-archive --create-jre-image'
"temurin" : '--create-source-archive --create-jre-image --create-sbom'
]
],

Expand All @@ -44,7 +44,7 @@ class Config17 {
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -54,7 +54,7 @@ class Config17 {
additionalNodeLabels: 'win2012&&vs2017',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -70,7 +70,7 @@ class Config17 {
weekly : []
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -84,7 +84,7 @@ class Config17 {
],
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -98,7 +98,7 @@ class Config17 {
test : 'default',
cleanWorkspaceAfterBuild: true,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -109,7 +109,7 @@ class Config17 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -123,7 +123,7 @@ class Config17 {
"openj9" : '--enable-dtrace --enable-jitserver'
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -135,7 +135,7 @@ class Config17 {
configureArgs : '--enable-dtrace',
testDynamic : false,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]

],
Expand All @@ -146,7 +146,7 @@ class Config17 {
additionalNodeLabels: 'macos11',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]

],
Expand All @@ -157,7 +157,7 @@ class Config17 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
]

Expand Down
24 changes: 12 additions & 12 deletions pipelines/jobs/configurations/jdk18u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Config18 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -33,7 +33,7 @@ class Config18 {
"temurin" : '--enable-dtrace'
],
buildArgs : [
"temurin" : '--create-source-archive --create-jre-image'
"temurin" : '--create-source-archive --create-jre-image --create-sbom'
]
],

Expand All @@ -44,7 +44,7 @@ class Config18 {
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -54,7 +54,7 @@ class Config18 {
additionalNodeLabels: 'win2012&&vs2017',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -70,7 +70,7 @@ class Config18 {
weekly : []
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -84,7 +84,7 @@ class Config18 {
],
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -98,7 +98,7 @@ class Config18 {
test : 'default',
cleanWorkspaceAfterBuild: true,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -109,7 +109,7 @@ class Config18 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -123,7 +123,7 @@ class Config18 {
"openj9" : '--enable-dtrace --enable-jitserver'
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -135,7 +135,7 @@ class Config18 {
configureArgs : '--enable-dtrace',
testDynamic : false,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -145,7 +145,7 @@ class Config18 {
additionalNodeLabels: 'macos11',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -155,7 +155,7 @@ class Config18 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
]
]
Expand Down
27 changes: 12 additions & 15 deletions pipelines/jobs/configurations/jdk19_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Config19 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -33,7 +33,7 @@ class Config19 {
"temurin" : '--enable-dtrace'
],
buildArgs : [
"temurin" : '--create-source-archive --create-jre-image'
"temurin" : '--create-source-archive --create-jre-image --create-sbom'
]
],

Expand All @@ -44,7 +44,7 @@ class Config19 {
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -54,7 +54,7 @@ class Config19 {
additionalNodeLabels: 'win2012&&vs2017',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -70,7 +70,7 @@ class Config19 {
weekly : []
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -80,12 +80,9 @@ class Config19 {
arch : 'x86-32',
additionalNodeLabels: 'win2012&&vs2017',
buildArgs : [
temurin : '--jvm-variant client,server'
temurin : '--jvm-variant client,server -create-jre-image --create-sbom'
],
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
]
],

ppc64Aix : [
Expand All @@ -98,7 +95,7 @@ class Config19 {
test : 'default',
cleanWorkspaceAfterBuild: true,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -109,7 +106,7 @@ class Config19 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -123,7 +120,7 @@ class Config19 {
"openj9" : '--enable-dtrace --enable-jitserver'
],
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -135,7 +132,7 @@ class Config19 {
configureArgs : '--enable-dtrace',
testDynamic : false,
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -145,7 +142,7 @@ class Config19 {
additionalNodeLabels: 'macos11',
test : 'default',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],

Expand All @@ -155,7 +152,7 @@ class Config19 {
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
"temurin" : '--create-jre-image'
"temurin" : '--create-jre-image --create-sbom'
]
],
riscv64Linux : [
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Config8 {
"dragonwell" : '--enable-unlimited-crypto --with-jvm-variants=server --with-zlib=system',
],
buildArgs : [
"temurin" : '--create-source-archive'
"temurin" : '--create-source-archive --create-sbom'
]
],

Expand All @@ -49,7 +49,7 @@ class Config8 {
arch : 'x86-32',
additionalNodeLabels: 'win2012',
buildArgs : [
temurin : '--jvm-variant client,server'
temurin : '--jvm-variant client,server --create-sbom'
],
test : 'default'
],
Expand Down

0 comments on commit c01efad

Please sign in to comment.