Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable SBOM strace for all Linux platforms #1065

Merged
merged 7 commits into from
Jul 5, 2024
Merged

Enable SBOM strace for all Linux platforms #1065

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d382b07
Enable SBOM strace for all Linux platforms
andrew-m-leonard Jul 1, 2024
2a64ece
Enable SBOM strace for all Linux platforms
andrew-m-leonard Jul 2, 2024
811f781
Enable SBOM strace for all Linux platforms
andrew-m-leonard Jul 2, 2024
1e4e463
Enable SBOM strace for all Linux platforms
andrew-m-leonard Jul 3, 2024
0b64435
Enable SBOM strace for all Linux platforms
andrew-m-leonard Jul 3, 2024
b019b42
Merge remote-tracking branch 'origin/master' into enable_strace
andrew-m-leonard Jul 4, 2024
16c21c1
Merge remote-tracking branch 'origin/master' into enable_strace
andrew-m-leonard Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,8 @@ class Build {
context.sh(script: 'rm -rf ' + context.WORKSPACE + '/workspace/target')
context.println 'Cleaning workspace build output files: ' + context.WORKSPACE + '/workspace/build/devkit'
context.sh(script: 'rm -rf ' + context.WORKSPACE + '/workspace/build/devkit')
context.println 'Cleaning workspace build output files: ' + context.WORKSPACE + '/workspace/build/straceOutput'
context.sh(script: 'rm -rf ' + context.WORKSPACE + '/workspace/build/straceOutput')
}
} else {
context.println 'Warning: Unable to clean workspace as context.WORKSPACE is null/empty'
Expand Down
26 changes: 16 additions & 10 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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 --create-sbom'
'temurin' : '--create-source-archive --create-sbom --enable-sbom-strace'
]
],

Expand All @@ -46,7 +46,7 @@ class Config11 {
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]
],

Expand All @@ -55,9 +55,12 @@ class Config11 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
configureArgs : [
'openj9' : '--enable-headless-only=yes',
'temurin' : '--enable-headless-only=yes --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]
],

Expand Down Expand Up @@ -104,7 +107,7 @@ class Config11 {
test : 'default',
configureArgs : '--enable-dtrace=auto',
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]
],

Expand All @@ -128,7 +131,7 @@ class Config11 {
'openj9' : '--enable-dtrace=auto'
],
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]

],
Expand All @@ -151,9 +154,12 @@ class Config11 {
dockerImage : 'adoptopenjdk/ubuntu1604_build_image',
dockerArgs : '--platform linux/arm/v7',
test : 'default',
configureArgs : '--enable-dtrace=auto',
configureArgs : [
'openj9' : '--enable-dtrace=auto',
'temurin' : '--enable-dtrace=auto --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]
],

Expand All @@ -169,14 +175,14 @@ class Config11 {
dragonwell: 'armv8.2'
],
configureArgs : [
'temurin' : '--enable-dtrace=auto',
'temurin' : '--enable-dtrace=auto --with-jobs=40',
'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\"",
'bisheng' : '--enable-dtrace=auto --with-extra-cflags=-fstack-protector-strong --with-extra-cxxflags=-fstack-protector-strong --with-jvm-variants=server'
],
buildArgs : [
'temurin' : '--create-sbom'
'temurin' : '--create-sbom --enable-sbom-strace'
]
],

Expand Down
29 changes: 19 additions & 10 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Config17 {
'temurin' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-source-archive --create-jre-image --create-sbom'
'temurin' : '--create-source-archive --create-jre-image --create-sbom --enable-sbom-strace'
]
],

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

Expand All @@ -62,9 +62,12 @@ class Config17 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
configureArgs : [
'openj9' : '--enable-headless-only=yes',
'temurin' : '--enable-headless-only=yes --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand Down Expand Up @@ -115,7 +118,7 @@ class Config17 {
],
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand All @@ -128,7 +131,7 @@ class Config17 {
'temurin' : true
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand All @@ -137,12 +140,15 @@ class Config17 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : '--enable-dtrace',
configureArgs : [
'openj9' : '--enable-dtrace',
'temurin' : '--enable-dtrace --with-jobs=40'
],
reproducibleCompare : [
'temurin' : true
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]

],
Expand All @@ -168,9 +174,12 @@ class Config17 {
dockerImage : 'adoptopenjdk/ubuntu1604_build_image',
dockerArgs : '--platform linux/arm/v7',
test : 'default',
configureArgs : '--enable-dtrace',
configureArgs : [
'openj9' : '--enable-dtrace',
'temurin' : '--enable-dtrace --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand Down
11 changes: 7 additions & 4 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Config21 {
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand All @@ -60,9 +60,12 @@ class Config21 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
configureArgs : [
'openj9' : '--enable-headless-only=yes',
'temurin' : '--enable-headless-only=yes --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand Down Expand Up @@ -108,7 +111,7 @@ class Config21 {
'temurin' : true
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

Expand Down
22 changes: 14 additions & 8 deletions pipelines/jobs/configurations/jdk22u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Config22 {
'temurin' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-source-archive --create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-source-archive --create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

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

Expand All @@ -55,9 +55,12 @@ class Config22 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
configureArgs : [
'openj9' : '--enable-headless-only=yes',
'temurin' : '--enable-headless-only=yes --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand Down Expand Up @@ -97,7 +100,7 @@ class Config22 {
dockerImage : 'rhel7_build_image',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

Expand All @@ -110,7 +113,7 @@ class Config22 {
'openj9' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

Expand All @@ -119,9 +122,12 @@ class Config22 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : '--enable-dtrace',
configureArgs : [
'openj9' : '--enable-dtrace',
'temurin' : '--enable-dtrace --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'
]
],

Expand Down
22 changes: 14 additions & 8 deletions pipelines/jobs/configurations/jdk23_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Config23 {
'temurin' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-source-archive --create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-source-archive --create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

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

Expand All @@ -55,9 +55,12 @@ class Config23 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
configureArgs : [
'openj9' : '--enable-headless-only=yes',
'temurin' : '--enable-headless-only=yes --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace'
]
],

Expand Down Expand Up @@ -97,7 +100,7 @@ class Config23 {
dockerImage : 'rhel7_build_image',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

Expand All @@ -110,7 +113,7 @@ class Config23 {
'openj9' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03'
]
],

Expand All @@ -119,9 +122,12 @@ class Config23 {
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : '--enable-dtrace',
configureArgs : [
'openj9' : '--enable-dtrace',
'temurin' : '--enable-dtrace --with-jobs=40'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'
'temurin' : '--create-jre-image --create-sbom --enable-sbom-strace --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b03'
]
],

Expand Down
Loading