Skip to content

Commit 2ea6631

Browse files
committed
Merge branch 'upgrade-rel-fix' into 'release/4.2'
Fix the CRON settings to match with job name for the nightly to run See merge request weblogic-cloud/weblogic-kubernetes-operator!4783
2 parents e441a6b + 74bcd4d commit 2ea6631

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

Jenkinsfile.oke

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ pipeline {
102102
choice(name: 'ISTIO_VERSION',
103103
description: 'Istio version',
104104
choices: [
105+
'1.23.0',
105106
'1.17.2',
106107
'1.16.1',
107108
'1.13.2',

Jenkinsfile.okeext

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ pipeline {
8080
choice(name: 'ISTIO_VERSION',
8181
description: 'Istio version',
8282
choices: [
83+
'1.23.0',
8384
'1.17.2',
8485
'1.16.1',
8586
'1.13.2',

Jenkinsfile.podman.upgrade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pipeline {
3030

3131
triggers {
3232
// timer trigger for "nightly build"
33-
parameterizedCron(env.JOB_NAME == 'wko-kind-main-nightly-podman-upgrade' ?
33+
parameterizedCron(env.JOB_NAME == 'wko-kind-release42-nightly-podman-upgrade' ?
3434
CRON_SETTINGS : '')
3535
}
3636

@@ -117,6 +117,7 @@ pipeline {
117117
choice(name: 'ISTIO_VERSION',
118118
description: 'Istio version',
119119
choices: [
120+
'1.23.0',
120121
'1.17.2',
121122
'1.16.1',
122123
'1.13.2',

integration-tests/src/test/resources/bash-scripts/install-istio.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Description:
66
#
77
# This script install a given version of istio using Helm v3.x
8-
# Default istio version is 1.13.2
8+
# Default istio version is 1.23.0
99
# https://istio.io/docs/setup/install/istioctl/
1010
# https://istio.io/latest/docs/setup/install/standalone-operator/
1111
# https://github.com/istio/istio/releases
@@ -56,7 +56,7 @@ ${KUBERNETES_CLI} create namespace istio-system
5656
}
5757

5858
# MAIN
59-
version=${1:-1.13.2}
59+
version=${1:-1.23.0}
6060
workdir=${2:-`pwd`}
6161
wko_tenancy=${3:-devweblogic}
6262
arch=${4:-linux-amd64}

0 commit comments

Comments
 (0)