update: fix wrong config path and fix scheduler if not set

adoptium · Dec 12, 2022 · 32fab1a · 32fab1a
1 parent 45540da
commit 32fab1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/pipelines/build/regeneration/build_pipeline_generator.groovy b/pipelines/build/regeneration/build_pipeline_generator.groovy
@@ -297,8 +297,8 @@ node('worker') {
                 // read out different target
                 def targetPrototype
                 try {
-                    def uFile = "${WORKSPACE}/${releaseConfigPath}/jdk${javaVersion}u_prototype.groovy"
-                    def nonUFile = "${WORKSPACE}/${releaseConfigPath}/jdk${javaVersion}_prototype.groovy"
+                    def uFile = "${WORKSPACE}/${prototypeFolderPath}/jdk${javaVersion}u_prototype.groovy"
+                    def nonUFile = "${WORKSPACE}/${prototypeFolderPath}/jdk${javaVersion}_prototype.groovy"
                     if(fileExists(uFile)) {
                         targetPrototype = load uFile
                     } else {
@@ -309,9 +309,13 @@ node('worker') {
                 }
                 config.put('targetConfigurations', targetPrototype.targetConfigurations)
 
-                // if has a triggerSchedule_prototype configed then use it or fall back to triggerSchedule_nightly
-                if (enablePipelineSchedule.toBoolean() && targetPrototype.triggerSchedule_prototype ) {
-                    config.put('pipelineSchedule', targetPrototype.triggerSchedule_prototype)
+                // if has a triggerSchedule_prototype variable set then use it or fall back to triggerSchedule_nightly
+                if (enablePipelineSchedule.toBoolean()){
+                    if (binding.variables["targetPrototype.triggerSchedule_prototype"]) {
+                        config.put('pipelineSchedule', targetPrototype.triggerSchedule_prototype)
+                    } else {
+                        config.put('pipelineSchedule', targetNightly.triggerSchedule_nightly)
+                    }
                 }
                 // genereate pipeline
                 println "[INFO] FINAL CONFIG FOR PROTOTYPE JDK${javaVersion}"

diff --git a/pipelines/jobs/configurations/jdk20_prototype.groovy b/pipelines/jobs/configurations/jdk20_prototype.groovy
@@ -7,4 +7,7 @@ targetConfigurations = [
         ]
 ]
 
+// 03:30 Wed, Fri
+triggerSchedule_prototype = 'TZ=UTC\nH 23 * * 6'
+
 return this