Skip to content

Commit 8f70222

Browse files
rjeberhardrjeberhard
committed
Merge branch 'wkt-jenkins-40' into 'release/4.0'
Backport Jenkins acceptance tests fixes See merge request weblogic-cloud/weblogic-kubernetes-operator!4189
2 parents dfb18da + 7ae4f62 commit 8f70222

File tree

19 files changed

+457
-380
lines changed

19 files changed

+457
-380
lines changed

‎.github/workflows/publish-github-pages.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2021, Oracle and/or its affiliates.
1+
# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
#
44
# Description
@@ -8,9 +8,12 @@ name: "PublishGitHubPages"
88

99
on:
1010
push:
11-
branches: [ main ]
11+
branches:
12+
- main
13+
paths:
14+
- 'documentation/**'
1215
schedule:
13-
- cron: '15 3 * * 1'
16+
- cron: '15 3 * * *'
1417

1518
defaults:
1619
run:
@@ -36,19 +39,7 @@ jobs:
3639
path: gh-pages
3740
token: ${{ secrets.PUBLISH_SECRET }}
3841

39-
- name: Verify changes to documentation present
40-
id: change-check
41-
run: |
42-
cd $GITHUB_WORKSPACE/main
43-
X=`git diff HEAD~1 --name-only | { grep "^documentation" || test $? = 1; } | wc -l`
44-
if [ $X == "0" ]; then
45-
echo 'No changes to the documenation'
46-
else
47-
echo '::set-output name=DOCUMENTATION_CHANGED::true'
48-
fi
49-
5042
- name: Build and publish site
51-
if: ${{ steps.change-check.outputs.DOCUMENTATION_CHANGED == 'true' }}
5243
run: |
5344
curl -fL -o hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v0.108.0/hugo_0.108.0_Linux-64bit.tar.gz"
5445
tar -xf hugo.tar.gz

‎Jenkinsfile

Lines changed: 114 additions & 171 deletions
Large diffs are not rendered by default.

‎Jenkinsfile.kindnightly

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,20 @@ def kind_k8s_map = [
8989
'1.21': 'kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1',
9090
'1.20.15': 'kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394',
9191
'1.20': 'kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394'
92+
],
93+
'0.18.0': [
94+
'1.26.3': 'kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f',
95+
'1.26': 'kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f',
96+
'1.25.8': 'kindest/node:v1.25.8@sha256:00d3f5314cc35327706776e95b2f8e504198ce59ac545d0200a89e69fce10b7f',
97+
'1.25': 'kindest/node:v1.25.8@sha256:00d3f5314cc35327706776e95b2f8e504198ce59ac545d0200a89e69fce10b7f',
98+
'1.24.12': 'kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16',
99+
'1.24': 'kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16',
100+
'1.23.17': 'kindest/node:v1.23.17@sha256:e5fd1d9cd7a9a50939f9c005684df5a6d145e8d695e78463637b79464292e66c',
101+
'1.23': 'kindest/node:v1.23.17@sha256:e5fd1d9cd7a9a50939f9c005684df5a6d145e8d695e78463637b79464292e66c',
102+
'1.22.17': 'kindest/node:v1.22.17@sha256:c8a828709a53c25cbdc0790c8afe12f25538617c7be879083248981945c38693',
103+
'1.22': 'kindest/node:v1.22.17@sha256:c8a828709a53c25cbdc0790c8afe12f25538617c7be879083248981945c38693',
104+
'1.21.14': 'kindest/node:v1.21.14@sha256:27ef72ea623ee879a25fe6f9982690a3e370c68286f4356bf643467c552a3888',
105+
'1.21': 'kindest/node:v1.21.14@sha256:27ef72ea623ee879a25fe6f9982690a3e370c68286f4356bf643467c552a3888'
92106
]
93107
]
94108
def _kind_image = null
@@ -102,7 +116,6 @@ pipeline {
102116
tools {
103117
maven 'maven-3.8.5'
104118
jdk 'OpenJDK 17.0.2'
105-
#jdk 'jdk11'
106119
}
107120

108121
environment {
@@ -151,6 +164,7 @@ pipeline {
151164
choice(name: 'KIND_VERSION',
152165
description: 'Kind version.',
153166
choices: [
167+
'0.18.0',
154168
'0.17.0',
155169
'0.16.0',
156170
'0.15.0',
@@ -161,26 +175,31 @@ pipeline {
161175
]
162176
)
163177
choice(name: 'KUBE_VERSION',
164-
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.17.0: 1.25, 1.25.3, 1.24, 1.24.7, 1.23, 1.23.13, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.16.0: 1.25, 1.25.2, 1.24, 1.24.6, 1.23, 1.23.12, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.15.0: 1.25, 1.25.0, 1.24, 1.24.4, 1.23, 1.23.10, 1.22, 1.22.13, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.13.0 and 0.14.0: 1.24, 1.24.0, 1.23, 1.23.6, 1.22, 1.22.9, 1.21, 1.21.12, 1.20, 1.20.15, Kind 0.12.0: 1.23, 1.23.4, 1.22, 1.22.7, 1.21, 1.21.10, 1.20, 1.20.15. Kind 0.11.1: 1.23, 1.23.3, 1.22, 1.22.5, 1.21, 1.21.1, 1.20, 1.20.7, 1.19, 1.19.11.',
178+
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.18.0: 1.26, 1.26.3, 1.25, 1.25.8, 1.24, 1.24.12, 1.23, 1.23.17, 1.22, 1.22.17, 1.21, and 1.21.14. Kind 0.17.0: 1.25, 1.25.3, 1.24, 1.24.7, 1.23, 1.23.13, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.16.0: 1.25, 1.25.2, 1.24, 1.24.6, 1.23, 1.23.12, 1.22, 1.22.15, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.15.0: 1.25, 1.25.0, 1.24, 1.24.4, 1.23, 1.23.10, 1.22, 1.22.13, 1.21, 1.21.14, 1.20, and 1.20.15. Kind 0.13.0 and 0.14.0: 1.24, 1.24.0, 1.23, 1.23.6, 1.22, 1.22.9, 1.21, 1.21.12, 1.20, 1.20.15, Kind 0.12.0: 1.23, 1.23.4, 1.22, 1.22.7, 1.21, 1.21.10, 1.20, 1.20.15. Kind 0.11.1: 1.23, 1.23.3, 1.22, 1.22.5, 1.21, 1.21.1, 1.20, 1.20.7, 1.19, 1.19.11.',
165179
choices: [
166180
// The first item in the list is the default value...
167-
'1.21.14',
181+
'1.25.8',
182+
'1.26',
183+
'1.26.3',
168184
'1.25',
169185
'1.25.3',
170186
'1.25.2',
171187
'1.25.0',
172188
'1.24',
189+
'1.24.12',
173190
'1.24.7',
174191
'1.24.6',
175192
'1.24.4',
176193
'1.24.0',
194+
'1.23.17',
177195
'1.23.13',
178196
'1.23.12',
179197
'1.23.10',
180198
'1.23.6',
181199
'1.23.4',
182200
'1.23.3',
183201
'1.23',
202+
'1.22.17',
184203
'1.22.15',
185204
'1.22.13',
186205
'1.22.9',
@@ -201,15 +220,17 @@ pipeline {
201220
)
202221
string(name: 'KUBECTL_VERSION',
203222
description: 'kubectl version',
204-
defaultValue: '1.21.5'
223+
defaultValue: '1.25.4'
205224
)
206225
string(name: 'HELM_VERSION',
207226
description: 'Helm version',
208-
defaultValue: '3.10.2'
227+
defaultValue: '3.11.2'
209228
)
210229
choice(name: 'ISTIO_VERSION',
211230
description: 'Istio version',
212231
choices: [
232+
'1.17.2',
233+
'1.16.1',
213234
'1.13.2',
214235
'1.12.6',
215236
'1.11.1',

‎Jenkinsfile.oke

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,19 @@ pipeline {
7474
)
7575
string(name: 'HELM_VERSION',
7676
description: 'Helm version',
77-
defaultValue: '3.10.2'
77+
defaultValue: '3.11.2'
7878
)
79-
string(name: 'ISTIO_VERSION',
80-
description: 'Other Possible Values 1.7.3, 1.8.1, 1.7.6',
81-
defaultValue: '1.16.1'
79+
choice(name: 'ISTIO_VERSION',
80+
description: 'Istio version',
81+
choices: [
82+
'1.17.2',
83+
'1.16.1',
84+
'1.13.2',
85+
'1.12.6',
86+
'1.11.1',
87+
'1.10.4',
88+
'1.9.9'
89+
]
8290
)
8391

8492
string(name: 'NUMBER_OF_THREADS',

‎integration-tests/pom.xml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
<wko.it.skip.cleanup>${env.SKIP_CLEANUP}</wko.it.skip.cleanup>
2222
<wko.it.domain.version>${env.DOMAIN_VERSION}</wko.it.domain.version>
2323
<wko.it.kind.repo>${env.KIND_REPO}</wko.it.kind.repo>
24-
<wko.it.test.images.repo>${env.TEST_IMAGES_REPO}</wko.it.test.images.repo>
2524
<wko.it.base.images.repo>${env.BASE_IMAGES_REPO}</wko.it.base.images.repo>
25+
<wko.it.base.images.tenancy>${env.WKO_TENANCY}</wko.it.base.images.tenancy>
26+
<wko.it.test.images.repo>${env.TEST_IMAGES_REPO}</wko.it.test.images.repo>
27+
<wko.it.test.images.tenancy>${env.WKO_TENANCY}</wko.it.test.images.tenancy>
2628
<wko.it.weblogic.image.name>${env.WEBLOGIC_IMAGE_NAME}</wko.it.weblogic.image.name>
2729
<wko.it.weblogic.image.tag>${env.WEBLOGIC_IMAGE_TAG}</wko.it.weblogic.image.tag>
2830
<wko.it.fmwinfra.image.name>${env.FMWINFRA_IMAGE_NAME}</wko.it.fmwinfra.image.name>
@@ -132,10 +134,18 @@
132134
<configuration>
133135
<skip>${skipITs}</skip>
134136
<rules>
135-
<requireEnvironmentVariable>
136-
<message>Set the BASE_IMAGES_REPO environment variable to specify the repo for pulling base weblogic/fmw images.</message>
137-
<variableName>BASE_IMAGES_REPO</variableName>
138-
</requireEnvironmentVariable>
137+
<requireProperty>
138+
<property>wko.it.base.images.repo</property>
139+
<message>Set the wko.it.base.images.repo property to specify the repo for pulling base weblogic/fmw images.</message>
140+
<regex>^[a-zA-Z0-9_]+.*$</regex>
141+
<regexMessage>The wko.it.base.images.repo must start with an alphanumeric character</regexMessage>
142+
</requireProperty>
143+
<requireProperty>
144+
<property>wko.it.base.images.tenancy</property>
145+
<message>Set the wko.it.base.images.tenancy property to specify the tenancy to use to pull base weblogic/fmw images.</message>
146+
<regex>^[a-zA-Z0-9_]+.*$</regex>
147+
<regexMessage>The wko.it.base.images.repo must start with an alphanumeric character</regexMessage>
148+
</requireProperty>
139149
<requireEnvironmentVariable>
140150
<message>Set the BASE_IMAGES_REPO_USERNAME environment variable to create pull secret for BASE_IMAGES_REPO.</message>
141151
<variableName>BASE_IMAGES_REPO_USERNAME</variableName>
@@ -148,10 +158,18 @@
148158
<message>Set the BASE_IMAGES_REPO_EMAIL environment variable to create pull secret for BASE_IMAGES_REPO.</message>
149159
<variableName>BASE_IMAGES_REPO_EMAIL</variableName>
150160
</requireEnvironmentVariable>
151-
<requireEnvironmentVariable>
152-
<message>Set the TEST_IMAGES_REPO environment variable to specify the repo for pulling local infra images and domain images.</message>
153-
<variableName>TEST_IMAGES_REPO</variableName>
154-
</requireEnvironmentVariable>
161+
<requireProperty>
162+
<property>wko.it.test.images.repo</property>
163+
<message>Set the wko.it.test.images.repo property to specify the repo for pulling local infra images and domain images.</message>
164+
<regex>^[a-zA-Z0-9_]+.*$</regex>
165+
<regexMessage>The wko.it.test.images.repo must start with an alphanumeric character</regexMessage>
166+
</requireProperty>
167+
<requireProperty>
168+
<property>wko.it.test.images.tenancy</property>
169+
<message>Set the wko.it.test.images.tenancy property to specify the tenancy to use to pull local infra images and domain images.</message>
170+
<regex>^[a-zA-Z0-9_]+.*$</regex>
171+
<regexMessage>The wko.it.test.images.repo must start with an alphanumeric character</regexMessage>
172+
</requireProperty>
155173
<requireEnvironmentVariable>
156174
<message>Set the TEST_IMAGES_REPO_USERNAME environment variable to create pull secret for TEST_IMAGES_REPO.</message>
157175
<variableName>TEST_IMAGES_REPO_USERNAME</variableName>

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioDomainInPV.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
1+
// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -212,7 +212,7 @@ void testIstioDomainHomeInPv() {
212212
// Add the LANG environment variable to ja_JP.utf8
213213
String imageLocation = null;
214214
if (KIND_REPO != null) {
215-
imageLocation = KIND_REPO + "weblogick8s/test-images/weblogic:" + LOCALE_IMAGE_TAG;
215+
imageLocation = KIND_REPO + "test-images/weblogic:" + LOCALE_IMAGE_TAG;
216216
} else {
217217
imageLocation = LOCALE_IMAGE_NAME + ":" + LOCALE_IMAGE_TAG;
218218
}

0 commit comments

Comments
 (0)