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

Limit docker label to linux special.system #1135

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Limit docker label to linux special.system #1135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ffa73
Limit docker label to linux special.system
sophia-guo Nov 5, 2024
7008c81
limit to temurin
sophia-guo Nov 6, 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
6 changes: 3 additions & 3 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 @@ -418,6 +418,8 @@ class Build {
testStages["${testType}"] = {
context.println "Running test: ${testType}"
context.stage("${testType}") {
def jobParams = getAQATestJobParams(testType)
def jobName = jobParams.TEST_JOB_NAME
def keep_test_reportdir = buildConfig.KEEP_TEST_REPORTDIR
def rerunIterations = '1'
if ("${testType}".contains('dev') || "${testType}".contains('external')) {
Expand All @@ -433,7 +435,7 @@ class Build {
DYNAMIC_COMPILE = true
}
def additionalTestLabel = buildConfig.ADDITIONAL_TEST_LABEL
if (testType == 'dev.openjdk' || testType == 'special.system') {
if (testType == 'dev.openjdk' || (testType == 'special.system' && jobName.contains('linux'))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if this adversely affects others using our pipelines (this is specific to Temurin (Eclipse Adoptium 'vendor' specific). Since no one has complained about this already, I will assume no, but future enhancement would be to frame it to only affect if vendor == Eclipse Adoptium).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated with buildConfig.VARIANT == 'temurin' with comment.

context.println "${testType} need extra label sw.tool.docker"
if (additionalTestLabel == '') {
additionalTestLabel = 'sw.tool.docker'
Expand All @@ -452,9 +454,7 @@ class Build {
vendorTestBranches = buildConfig.BUILD_REF ?: vendorTestBranches
}

def jobParams = getAQATestJobParams(testType)

def jobName = jobParams.TEST_JOB_NAME
String helperRef = buildConfig.HELPER_REF ?: DEFAULTS_JSON['repository']['helper_ref']
def JobHelper = context.library(identifier: "openjdk-jenkins-helper@${helperRef}").JobHelper

Expand Down
4 changes: 2 additions & 2 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 @@ -68,7 +68,7 @@ class Config21 {
arch : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
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']
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
Expand Down Expand Up @@ -138,7 +138,7 @@ class Config21 {
arch : 'aarch64',
additionalNodeLabels: 'xcode15.0.1',
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']
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
6 changes: 4 additions & 2 deletions pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Config23 {
arch : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
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']
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
Expand Down Expand Up @@ -138,7 +138,9 @@ class Config23 {
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'xcode15.0.1',
test : 'default',
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Config24 {
arch : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
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']
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0'
Expand Down Expand Up @@ -139,7 +139,7 @@ class Config24 {
arch : 'aarch64',
additionalNodeLabels: 'xcode15.0.1',
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']
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', 'special.system']
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down