Skip to content

Commit f27824a

Browse files
committed
Merge branch 'jenrunbackport' into 'release/4.2'
Backport changes for Jenkinfile.oke to 4.2 See merge request weblogic-cloud/weblogic-kubernetes-operator!4701
2 parents 35ea1dd + d58f5f8 commit f27824a

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Jenkinsfile.oke

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
//
44

5-
CRON_SETTINGS = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
5+
CRON_SETTINGS_MAIN = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
66
H 2 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
7+
8+
CRON_SETTINGS_42 = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq42one;PARALLEL_RUN=false
9+
H 2 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
10+
11+
CRON_SETTINGS = "${env.JOB_NAME == 'wko-oke-nightly' ? CRON_SETTINGS_MAIN : CRON_SETTINGS_42}"
12+
713
pipeline {
814
agent { label 'large' }
915
options {
@@ -12,8 +18,8 @@ pipeline {
1218
}
1319
triggers {
1420
// timer trigger for "nightly build"
15-
parameterizedCron(env.JOB_NAME == 'wko-oke-nightly' ?
16-
CRON_SETTINGS : '')
21+
parameterizedCron(env.JOB_NAME == 'wko-oke-dev' ?
22+
'' : CRON_SETTINGS)
1723
}
1824
tools {
1925
maven 'maven-3.8.7'
@@ -138,7 +144,7 @@ pipeline {
138144
)
139145
string(name: 'MOUNT_TARGET_OCID',
140146
description: 'only for debug runs on wko-oke-dev',
141-
defaultValue: "test"
147+
defaultValue: "ocid1.mounttarget.oc1.phx.aaaaaby27vhqpci5obuhqllqojxwiotqnb4c2ylefuzqaaaa"
142148
)
143149
string(name: 'BRANCH',
144150
description: '',

0 commit comments

Comments
 (0)