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

Set programmatically enableInstallers and enableSigner flags #17

Open
wants to merge 1 commit into
base: ibm
Choose a base branch
from
Open

Set programmatically enableInstallers and enableSigner flags #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pipelines/build/common/config_regeneration.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,8 +444,8 @@ class Regeneration implements Serializable {
ADOPT_BUILD_NUMBER: "",
ENABLE_TESTS: DEFAULTS_JSON['testDetails']['enableTests'] as Boolean,
ENABLE_TESTDYNAMICPARALLEL: DEFAULTS_JSON['testDetails']['enableTestDynamicParallel'] as Boolean,
ENABLE_INSTALLERS: true,
ENABLE_SIGNER: true,
ENABLE_INSTALLERS: DEFAULTS_JSON['enableInstallers'] as Boolean,
ENABLE_SIGNER: DEFAULTS_JSON['enableSigner'] as Boolean,
CLEAN_WORKSPACE: true,
CLEAN_WORKSPACE_AFTER: true,
CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER: false
Expand Down
3 changes: 3 additions & 0 deletions pipelines/build/regeneration/build_pipeline_generator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ node('master') {
config.put("defaultsJson", DEFAULTS_JSON)
config.put("adoptDefaultsJson", ADOPT_DEFAULTS_JSON)

config.put("enableInstallers", DEFAULTS_JSON['enableInstallers'] as Boolean)
config.put("enableSigner", DEFAULTS_JSON['enableSigner'] as Boolean)

println "[INFO] FINAL CONFIG FOR NIGHTLY $javaVersion"
println JsonOutput.prettyPrint(JsonOutput.toJson(config))

Expand Down
10 changes: 6 additions & 4 deletions pipelines/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"rootUrl" : "https://hyc-runtimes-jenkins.swg-devops.com/",
"rootDirectory" : "build-scripts"
},
"templateDirectories" : {
"templateDirectories" : {
"downstream" : "pipelines/build/common/create_job_from_template.groovy",
"upstream" : "pipelines/jobs/pipeline_job_template.groovy",
"weekly" : "pipelines/jobs/weekly_release_pipeline_job_template.groovy"
Expand All @@ -30,7 +30,7 @@
"tester" : "pipelines/build/prTester/pr_test_pipeline.groovy",
"buildfarm" : "build-farm/make-adopt-build-farm.sh"
},
"baseFileDirectories": {
"baseFileDirectories" : {
"upstream" : "pipelines/build/common/build_base_file.groovy",
"downstream" : "pipelines/build/common/openjdk_build_pipeline.groovy"
},
Expand All @@ -45,15 +45,15 @@
"sanity.system",
"special.system"
],
"weeklyDefault" : [
"weeklyDefault" : [
"extended.openjdk",
"extended.perf",
"extended.jck",
"extended.system",
"special.functional",
"special.jck"
],
"disabled" : [
"disabled" : [
"sanity.external"
],
"enableTestDynamicParallel" : false,
Expand All @@ -62,6 +62,8 @@
"numMachines" : "3"
}
},
"enableInstallers" : false,
"enableSigner" : true,
"importLibraryScript" : "pipelines/build/common/import_lib.groovy",
"defaultsUrl" : "https://raw.githubusercontent.com/ibmruntimes/ci-jenkins-pipelines/ibm/pipelines/defaults.json"
}
4 changes: 2 additions & 2 deletions pipelines/jobs/pipeline_job_template.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ gitRefSpec = ""
propagateFailures = true
runTests = enableTests
runParallel = true
runInstaller = true
runSigner = true
runInstaller = enableInstallers
runSigner = enableSigner
cleanWsBuildOutput = true
jdkVersion = "${JAVA_VERSION}"
isLightweight = true
Expand Down