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

Ensure target is reset before loading a jdk pipeline config file #774

Merged
merged 12 commits into from
Aug 11, 2023
Merged

Ensure target is reset before loading a jdk pipeline config file #774

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
44a9096
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
c392bda
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
b622cb9
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
e8eef9d
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
e7c51c6
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
6861a6d
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
4636ca4
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
74c1ee3
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
09a6468
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
798ffa9
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
372cdfd
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
04fd251
Ensure target is reset before loading a jdk pipeline config file
andrew-m-leonard Aug 11, 2023
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
25 changes: 19 additions & 6 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 @@ -192,6 +192,8 @@ node('worker') {
checkoutUserPipelines()
}
}
println "[INFO] JDK${javaVersion}: loaded target configuration:"
println JsonOutput.prettyPrint(JsonOutput.toJson(target))

config.put('targetConfigurations', target.targetConfigurations)

Expand All @@ -203,7 +205,11 @@ node('worker') {
}

if (enablePipelineSchedule.toBoolean()) {
config.put('pipelineSchedule', target.triggerSchedule_nightly)
try {
config.put('pipelineSchedule', target.triggerSchedule_nightly)
} catch (Exception ex) {
config.put('pipelineSchedule', '0 0 31 2 0')
}
}

if (useAdoptShellScripts.toBoolean()) {
Expand Down Expand Up @@ -231,8 +237,6 @@ node('worker') {
checkoutUserPipelines()
}

target.disableJob = false

generatedPipelines.add(config['JOB_NAME'])

// Create weekly release pipeline
Expand All @@ -252,7 +256,11 @@ node('worker') {
def weeklyTemplatePath = (params.WEEKLY_TEMPLATE_PATH) ?: DEFAULTS_JSON['templateDirectories']['weekly']

if (enablePipelineSchedule.toBoolean()) {
config.put('pipelineSchedule', target.triggerSchedule_weekly)
try {
config.put('pipelineSchedule', target.triggerSchedule_weekly)
} catch (Exception ex) {
config.put('pipelineSchedule', '0 0 31 2 0')
}
}
config.releaseType = "Weekly"

Expand All @@ -272,9 +280,14 @@ node('worker') {
checkoutUserPipelines()
}

target.disableJob = false

generatedPipelines.add(config['JOB_NAME'])

// config.load() loads into the current groovy binding, and returns "this", so we need to reset variables before next load of target
target.targetConfigurations = {}
target.triggerSchedule_nightly = '0 0 31 2 0'
target.triggerSchedule_weekly = '0 0 31 2 0'
target.weekly_release_scmReferences = {}
target.disableJob = false
})

// Fail if nothing was generated
Expand Down