Fix user ci pipeline setup usage (#712)

andrew-m-leonard · web-flow · commit bc206dcf5aab · 2023-06-02T15:20:32.000+01:00
* Fix user ci pipeline setup usage

Signed-off-by: Andrew Leonard &lt;anleonar@redhat.com&gt;

* Fix user ci pipeline setup usage

Signed-off-by: Andrew Leonard &lt;anleonar@redhat.com&gt;

---------

Signed-off-by: Andrew Leonard &lt;anleonar@redhat.com&gt;
diff --git a/pipelines/build/regeneration/build_pipeline_generator.groovy b/pipelines/build/regeneration/build_pipeline_generator.groovy
@@ -268,7 +268,7 @@ node('worker') {
                 } catch (Exception e) {
                     println "${e}\n[WARNING] Something went wrong when creating the weekly job dsl. It may be because we are trying to pull the template inside a user repository. Using Adopt's template instead..."
                     checkoutAdoptPipelines()
-                    jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weeklyTemplatePath'], ignoreExisting: false, additionalParameters: config
+                    jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weekly'], ignoreExisting: false, additionalParameters: config
                     checkoutUserPipelines()
                 }
 
diff --git a/pipelines/build/regeneration/evaluation_pipeline_generator.groovy b/pipelines/build/regeneration/evaluation_pipeline_generator.groovy
@@ -273,7 +273,7 @@ node('worker') {
                     } catch (Exception e) {
                         println "${e}\n[WARNING] Something went wrong when creating the weekly evaluation job dsl. It may be because we are trying to pull the template inside a user repository. Using Adopt's template instead..."
                         checkoutAdoptPipelines()
-                        jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weeklyTemplatePath'], ignoreExisting: false, additionalParameters: config
+                        jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weekly'], ignoreExisting: false, additionalParameters: config
                         checkoutUserPipelines()
                     }
                     // add into list
@@ -295,4 +295,4 @@ node('worker') {
         println '[INFO] Cleaning up...'
         cleanWs deleteDirs: true
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ node('worker') {`
`268`	`268`	`} catch (Exception e) {`
`269`	`269`	`println "${e}\n[WARNING] Something went wrong when creating the weekly job dsl. It may be because we are trying to pull the template inside a user repository. Using Adopt's template instead..."`
`270`	`270`	`checkoutAdoptPipelines()`
`271`		`- jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weeklyTemplatePath'], ignoreExisting: false, additionalParameters: config`
	`271`	`+ jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weekly'], ignoreExisting: false, additionalParameters: config`
`272`	`272`	`checkoutUserPipelines()`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ node('worker') {`
`273`	`273`	`} catch (Exception e) {`
`274`	`274`	`println "${e}\n[WARNING] Something went wrong when creating the weekly evaluation job dsl. It may be because we are trying to pull the template inside a user repository. Using Adopt's template instead..."`
`275`	`275`	`checkoutAdoptPipelines()`
`276`		`- jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weeklyTemplatePath'], ignoreExisting: false, additionalParameters: config`
	`276`	`+ jobDsl targets: ADOPT_DEFAULTS_JSON['templateDirectories']['weekly'], ignoreExisting: false, additionalParameters: config`
`277`	`277`	`checkoutUserPipelines()`
`278`	`278`	`}`
`279`	`279`	`// add into list`
`@@ -295,4 +295,4 @@ node('worker') {`
`295`	`295`	`println '[INFO] Cleaning up...'`
`296`	`296`	`cleanWs deleteDirs: true`
`297`	`297`	`}`
`298`		`-}`
	`298`	`+}`