Skip to content

Commit

Permalink
Merge pull request adoptium#54 from AdamBrousseau/remove_vendor_confi…
Browse files Browse the repository at this point in the history 
…g_params

Remove vendor config params from job config groovy
  • Loading branch information
@AdamBrousseau
AdamBrousseau authored Feb 25, 2022
2 parents ae60366 + cefbd1a commit 176430d
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 47 deletions.
29 changes: 13 additions & 16 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Config11 {
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_14',
test : 'default',
configureArgs : [
"openj9" : '--enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues',
"openj9" : '--enable-dtrace=auto --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"',
"hotspot" : '--enable-dtrace=auto'
]
],
Expand All @@ -17,7 +17,7 @@ class Config11 {
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_14',
test : 'default',
configureArgs : [
"openj9" : '--enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
"openj9" : '--enable-dtrace=auto '
],
additionalFileNameTag: "IBM",
buildArgs : "--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk"
Expand All @@ -35,7 +35,7 @@ class Config11 {
dockerCredential : '9f50c848-8764-440d-b95a-1d295c21713e',
test : 'default',
configureArgs : [
"openj9" : '--disable-ccache --enable-jitserver --enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues',
"openj9" : '--disable-ccache --enable-jitserver --enable-dtrace=auto --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"',
"hotspot" : '--enable-dtrace=auto',
"corretto" : '--enable-dtrace=auto',
"SapMachine" : '--enable-dtrace=auto',
Expand Down Expand Up @@ -79,7 +79,7 @@ class Config11 {
],

configureArgs : [
"openj9" : '--disable-ccache --enable-jitserver --enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
"openj9" : '--disable-ccache --enable-jitserver --enable-dtrace=auto'
],
additionalFileNameTag: "IBM",
buildArgs : "--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk"
Expand All @@ -103,7 +103,7 @@ class Config11 {
],
test : 'default',
configureArgs : [
"openj9" : '--with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues --with-jdk-rc-name="IBM Semeru Runtime"',
"openj9" : '--with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-jdk-rc-name="IBM Semeru Runtime"',
"hotspot" : '--jvm-variant client,server'
]
],
Expand All @@ -119,7 +119,7 @@ class Config11 {
],
test : 'default',
configureArgs : [
"openj9" : '--with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues --with-jdk-rc-name="IBM Semeru Runtime"'
"openj9" : '--with-jdk-rc-name="IBM Semeru Runtime"'
],
additionalFileNameTag: "IBM"
],
Expand All @@ -142,7 +142,7 @@ class Config11 {
],
test : 'default',
configureArgs : [
"openj9" : '--with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
"openj9" : '--with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"'
]
],

Expand All @@ -153,9 +153,6 @@ class Config11 {
openj9: 'hw.arch.ppc64 && sw.os.aix.7_1'
],
test : 'default',
configureArgs : [
"openj9" : '--with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
],
additionalFileNameTag: "IBM",
buildArgs : "--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk"
],
Expand All @@ -167,7 +164,7 @@ class Config11 {
additionalNodeLabels: [
openj9: 'hw.arch.s390x && (sw.os.cent.7 || sw.os.rhel.7)'
],
configureArgs : '--enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
configureArgs : '--enable-dtrace=auto --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"'
],

s390xLinuxIBM : [
Expand Down Expand Up @@ -196,7 +193,7 @@ class Config11 {
additionalNodeLabels: [
openj9: 'hw.arch.s390x && (sw.os.cent.7 || sw.os.rhel.7)'
],
configureArgs : '--enable-dtrace=auto --with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues',
configureArgs : '--enable-dtrace=auto',
additionalFileNameTag: "IBM",
buildArgs : "--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk"
],
Expand All @@ -218,7 +215,7 @@ class Config11 {
],
configureArgs : [
"hotspot" : '--enable-dtrace=auto',
"openj9" : '--enable-dtrace=auto --enable-jitserver --with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
"openj9" : '--enable-dtrace=auto --enable-jitserver --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"'
]
],

Expand Down Expand Up @@ -250,7 +247,7 @@ class Config11 {
openj9: 'hw.arch.ppc64le && (sw.os.cent.7 || sw.os.rhel.7)'
],
configureArgs : [
"openj9" : '--enable-dtrace=auto --enable-jitserver --with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
"openj9" : '--enable-dtrace=auto --enable-jitserver'
],
additionalFileNameTag: "IBM",
buildArgs : "--ssh --disable-adopt-branch-safety -r [email protected]:runtimes/openj9-openjdk-jdk11 -b ibm_sdk"
Expand All @@ -275,7 +272,7 @@ class Config11 {
test : 'default',
configureArgs : [
"hotspot" : '--enable-dtrace=auto',
"openj9" : '--enable-dtrace=auto --without-version-opt --with-vendor-name="International Business Machines Corporation" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues',
"openj9" : '--enable-dtrace=auto --without-version-opt --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"',
"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'
Expand Down Expand Up @@ -313,7 +310,7 @@ class Config11 {
],
configureArgs : [
"hotspot" : '--enable-dtrace=auto',
"openj9" : '--enable-dtrace=auto --without-version-opt --with-vendor-name="International Business Machines Corporation" --with-vendor-url=https://www.ibm.com/semeru-runtimes --with-vendor-bug-url=https://github.com/ibmruntimes/Semeru-Runtimes/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues',
"openj9" : '--enable-dtrace=auto --without-version-opt ',
"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'
Expand Down
Loading

0 comments on commit 176430d

Please sign in to comment.