Merge branch 'rel41jenkin' into 'release/4.1'

rjeberhard · rjeberhard · commit d440f6af7b16 · 2023-07-19T13:56:19.000Z
release/41 kind daily jenkin

See merge request weblogic-cloud/weblogic-kubernetes-operator!4352
diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly
@@ -60,8 +60,7 @@ def kind_k8s_map = [
     ]
 ]
 def _kind_image = null
-CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel
-                   H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential;KUBE_VERSION=1.24.12;KIND_VERSION=0.18.0'''
+CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel'''
 
 
 pipeline {
@@ -71,7 +70,7 @@ pipeline {
     }
     triggers {
         // timer trigger for "nightly build"
-        parameterizedCron(env.JOB_NAME == 'wko-kind-main-nightly' ?
+        parameterizedCron(env.JOB_NAME == 'wko-kind-release41-nightly' ?
         CRON_SETTINGS : '')
     }
 

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ def kind_k8s_map = [`
`60`	`60`	`]`
`61`	`61`	`]`
`62`	`62`	`def _kind_image = null`
`63`		`-CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel`
`64`		`- H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential;KUBE_VERSION=1.24.12;KIND_VERSION=0.18.0'''`
	`63`	`+CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel'''`
`65`	`64`
`66`	`65`
`67`	`66`	`pipeline {`
`@@ -71,7 +70,7 @@ pipeline {`
`71`	`70`	`}`
`72`	`71`	`triggers {`
`73`	`72`	`// timer trigger for "nightly build"`
`74`		`- parameterizedCron(env.JOB_NAME == 'wko-kind-main-nightly' ?`
	`73`	`+ parameterizedCron(env.JOB_NAME == 'wko-kind-release41-nightly' ?`
`75`	`74`	`CRON_SETTINGS : '')`
`76`	`75`	`}`
`77`	`76`