Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 258666f

Browse files
anpanigrrjeberhard
authored andcommitted
Support for K8v 1.26
1 parent d019ec6 commit 258666f

File tree

6 files changed

+43
-195
lines changed

6 files changed

+43
-195
lines changed

‎Jenkinsfile‎

Lines changed: 6 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,6 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
//
44
def kind_k8s_map = [
5-
'0.11.1': [
6-
'1.23.3': 'kindest/node:v1.23.3@sha256:0cb1a35ccd539118ce38d29a97823bae8fcef22fc94e9e33c0f4fadcdf9d4059',
7-
'1.23': 'kindest/node:v1.23.3@sha256:0cb1a35ccd539118ce38d29a97823bae8fcef22fc94e9e33c0f4fadcdf9d4059',
8-
'1.22.5': 'kindest/node:v1.22.5@sha256:a2b3127dd056f04e9fef46cc153a9452f5a4a09e818528da746f4a3b45148c74',
9-
'1.22': 'kindest/node:v1.22.5@sha256:a2b3127dd056f04e9fef46cc153a9452f5a4a09e818528da746f4a3b45148c74',
10-
'1.21.1': 'kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6',
11-
'1.21': 'kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6',
12-
'1.20.7': 'kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9',
13-
'1.20': 'kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9',
14-
'1.19.11': 'kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729',
15-
'1.19': 'kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729'
16-
],
17-
'0.12.0': [
18-
'1.23.4': 'kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9',
19-
'1.23': 'kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9',
20-
'1.22.7': 'kindest/node:v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166',
21-
'1.22': 'kindest/node:v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166',
22-
'1.21.10': 'kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c',
23-
'1.21': 'kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c',
24-
'1.20.15': 'kindest/node:v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb',
25-
'1.20': 'kindest/node:v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb'
26-
],
27-
'0.13.0': [
28-
'1.24.0': 'kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1',
29-
'1.24': 'kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1',
30-
'1.23.6': 'kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355',
31-
'1.23': 'kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355',
32-
'1.22.9': 'kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e',
33-
'1.22': 'kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e',
34-
'1.21.12': 'kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e',
35-
'1.21': 'kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e',
36-
'1.20.15': 'kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3',
37-
'1.20': 'kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3'
38-
],
39-
'0.14.0': [
40-
'1.24.0': 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e',
41-
'1.24': 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e',
42-
'1.23.6': 'kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae',
43-
'1.23': 'kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae',
44-
'1.22.9': 'kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105',
45-
'1.22': 'kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105',
46-
'1.21.12': 'kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207',
47-
'1.21': 'kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207',
48-
'1.20.15': 'kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248',
49-
'1.20': 'kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248'
50-
],
515
'0.15.0': [
526
'1.25.0': 'kindest/node:v1.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf',
537
'1.25': 'kindest/node:v1.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf',
@@ -158,20 +112,16 @@ pipeline {
158112
'0.18.0',
159113
'0.17.0',
160114
'0.16.0',
161-
'0.15.0',
162-
'0.14.0',
163-
'0.13.0',
164-
'0.12.0',
165-
'0.11.1'
115+
'0.15.0'
166116
]
167117
)
168118
choice(name: 'KUBE_VERSION',
169-
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.',
119+
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',
170120
choices: [
171121
// The first item in the list is the default value...
122+
'1.26.3',
172123
'1.25.8',
173124
'1.26',
174-
'1.26.3',
175125
'1.25',
176126
'1.25.3',
177127
'1.25.2',
@@ -204,15 +154,9 @@ pipeline {
204154
'1.21',
205155
'1.20.15',
206156
'1.20.7',
207-
'1.20',
208-
'1.19.11',
209-
'1.19'
157+
'1.20'
210158
]
211159
)
212-
string(name: 'KUBECTL_VERSION',
213-
description: 'kubectl version',
214-
defaultValue: '1.25.4'
215-
)
216160
string(name: 'HELM_VERSION',
217161
description: 'Helm version',
218162
defaultValue: '3.11.2'
@@ -399,12 +343,13 @@ pipeline {
399343
stage ('Install kubectl') {
400344
environment {
401345
runtime_path = "${WORKSPACE}/bin:${PATH}"
346+
KUBE_VERSION = "${params.KUBE_VERSION}"
402347
}
403348
steps {
404349
sh '''
405350
export PATH=${runtime_path}
406351
oci os object get --namespace=${wko_tenancy} --bucket-name=wko-system-test-files \
407-
--name=kubectl/kubectl-v${KUBECTL_VERSION} --file=${WORKSPACE}/bin/kubectl \
352+
--name=kubectl/kubectl-v${KUBE_VERSION} --file=${WORKSPACE}/bin/kubectl \
408353
--auth=instance_principal
409354
chmod +x ${WORKSPACE}/bin/kubectl
410355
kubectl version --client=true

‎Jenkinsfile.kindnightly‎

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,6 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
//
44
def kind_k8s_map = [
5-
'0.11.1': [
6-
'1.23.3': 'kindest/node:v1.23.3@sha256:0cb1a35ccd539118ce38d29a97823bae8fcef22fc94e9e33c0f4fadcdf9d4059',
7-
'1.23': 'kindest/node:v1.23.3@sha256:0cb1a35ccd539118ce38d29a97823bae8fcef22fc94e9e33c0f4fadcdf9d4059',
8-
'1.22.5': 'kindest/node:v1.22.5@sha256:a2b3127dd056f04e9fef46cc153a9452f5a4a09e818528da746f4a3b45148c74',
9-
'1.22': 'kindest/node:v1.22.5@sha256:a2b3127dd056f04e9fef46cc153a9452f5a4a09e818528da746f4a3b45148c74',
10-
'1.21.1': 'kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6',
11-
'1.21': 'kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6',
12-
'1.20.7': 'kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9',
13-
'1.20': 'kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9',
14-
'1.19.11': 'kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729',
15-
'1.19': 'kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729'
16-
],
17-
'0.12.0': [
18-
'1.23.4': 'kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9',
19-
'1.23': 'kindest/node:v1.23.4@sha256:0e34f0d0fd448aa2f2819cfd74e99fe5793a6e4938b328f657c8e3f81ee0dfb9',
20-
'1.22.7': 'kindest/node:v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166',
21-
'1.22': 'kindest/node:v1.22.7@sha256:1dfd72d193bf7da64765fd2f2898f78663b9ba366c2aa74be1fd7498a1873166',
22-
'1.21.10': 'kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c',
23-
'1.21': 'kindest/node:v1.21.10@sha256:84709f09756ba4f863769bdcabe5edafc2ada72d3c8c44d6515fc581b66b029c',
24-
'1.20.15': 'kindest/node:v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb',
25-
'1.20': 'kindest/node:v1.20.15@sha256:393bb9096c6c4d723bb17bceb0896407d7db581532d11ea2839c80b28e5d8deb'
26-
],
27-
'0.13.0': [
28-
'1.24.0': 'kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1',
29-
'1.24': 'kindest/node:v1.24.0@sha256:406fd86d48eaf4c04c7280cd1d2ca1d61e7d0d61ddef0125cb097bc7b82ed6a1',
30-
'1.23.6': 'kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355',
31-
'1.23': 'kindest/node:v1.23.6@sha256:1af0f1bee4c3c0fe9b07de5e5d3fafeb2eec7b4e1b268ae89fcab96ec67e8355',
32-
'1.22.9': 'kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e',
33-
'1.22': 'kindest/node:v1.22.9@sha256:6e57a6b0c493c7d7183a1151acff0bfa44bf37eb668826bf00da5637c55b6d5e',
34-
'1.21.12': 'kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e',
35-
'1.21': 'kindest/node:v1.21.12@sha256:ae05d44cc636ee961068399ea5123ae421790f472c309900c151a44ee35c3e3e',
36-
'1.20.15': 'kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3',
37-
'1.20': 'kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3'
38-
],
39-
'0.14.0': [
40-
'1.24.0': 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e',
41-
'1.24': 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e',
42-
'1.23.6': 'kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae',
43-
'1.23': 'kindest/node:v1.23.6@sha256:b1fa224cc6c7ff32455e0b1fd9cbfd3d3bc87ecaa8fcb06961ed1afb3db0f9ae',
44-
'1.22.9': 'kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105',
45-
'1.22': 'kindest/node:v1.22.9@sha256:8135260b959dfe320206eb36b3aeda9cffcb262f4b44cda6b33f7bb73f453105',
46-
'1.21.12': 'kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207',
47-
'1.21': 'kindest/node:v1.21.12@sha256:f316b33dd88f8196379f38feb80545ef3ed44d9197dca1bfd48bcb1583210207',
48-
'1.20.15': 'kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248',
49-
'1.20': 'kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248'
50-
],
515
'0.15.0': [
526
'1.25.0': 'kindest/node:v1.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf',
537
'1.25': 'kindest/node:v1.25.0@sha256:428aaa17ec82ccde0131cb2d1ca6547d13cf5fdabcc0bbecf749baa935387cbf',
@@ -107,7 +61,7 @@ def kind_k8s_map = [
10761
]
10862
def _kind_image = null
10963
CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel
110-
H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential'''
64+
H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential;KUBE_VERSION=1.24.12;KIND_VERSION=0.18.0'''
11165

11266

11367
pipeline {
@@ -177,12 +131,12 @@ pipeline {
177131
]
178132
)
179133
choice(name: 'KUBE_VERSION',
180-
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.',
134+
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',
181135
choices: [
182136
// The first item in the list is the default value...
183-
'1.25.8',
184-
'1.26',
185137
'1.26.3',
138+
'1.26',
139+
'1.25.8',
186140
'1.25',
187141
'1.25.3',
188142
'1.25.2',
@@ -215,15 +169,9 @@ pipeline {
215169
'1.21',
216170
'1.20.15',
217171
'1.20.7',
218-
'1.20',
219-
'1.19.11',
220-
'1.19'
172+
'1.20'
221173
]
222174
)
223-
string(name: 'KUBECTL_VERSION',
224-
description: 'kubectl version',
225-
defaultValue: '1.25.4'
226-
)
227175
string(name: 'HELM_VERSION',
228176
description: 'Helm version',
229177
defaultValue: '3.11.2'
@@ -407,7 +355,7 @@ pipeline {
407355
sh '''
408356
export PATH=${runtime_path}
409357
oci os object get --namespace=${wko_tenancy} --bucket-name=wko-system-test-files \
410-
--name=kubectl/kubectl-v${KUBECTL_VERSION} --file=${WORKSPACE}/bin/kubectl \
358+
--name=kubectl/kubectl-v${KUBE_VERSION} --file=${WORKSPACE}/bin/kubectl \
411359
--auth=instance_principal
412360
chmod +x ${WORKSPACE}/bin/kubectl
413361
kubectl version --client=true

‎jenkinsScript.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This script checks for the below required environment variables on Jenkins and runs the integration tests
66
# APACHE_MAVEN_HOME
77
# HELM_VERSION
8-
# KUBECTL_VERSION
8+
# KUBE_VERSION
99
# KIND_VERSION
1010
# IT_TEST
1111
# WDT_DOWNLOAD_URL
@@ -58,7 +58,7 @@ echo "WORKSPACE ${WORKSPACE}"
5858
checkEnvVars \
5959
APACHE_MAVEN_HOME \
6060
HELM_VERSION \
61-
KUBECTL_VERSION \
61+
KUBE_VERSION \
6262
KIND_VERSION \
6363
IT_TEST \
6464
WDT_DOWNLOAD_URL \
@@ -90,9 +90,9 @@ helm version
9090

9191
KCLI="kubectl" # this string has a deliberate exclusion in the 'validateCLI.sh' validation check for direct use of the k8s cli
9292
echo "Info: Set up ${KCLI}..."
93-
curl -Lo "${WORKSPACE}/bin/${KCLI}" "https://objectstorage.us-phoenix-1.oraclecloud.com/n/weblogick8s/b/wko-system-test-files/o/${KCLI}%2F${KCLI}-v${KUBECTL_VERSION}"
93+
curl -Lo "${WORKSPACE}/bin/${KCLI}" "https://objectstorage.us-phoenix-1.oraclecloud.com/n/weblogick8s/b/wko-system-test-files/o/${KCLI}%2F${KCLI}-v${KUBE_VERSION}"
9494
chmod +x ${WORKSPACE}/bin/${KCLI}
95-
${KCLI} version --client=true
95+
${KCLI} version --client=true -o yaml
9696

9797
echo 'Info: Set up kind...'
9898
curl -Lo "${WORKSPACE}/bin/kind" "https://objectstorage.us-phoenix-1.oraclecloud.com/n/weblogick8s/b/wko-system-test-files/o/kind%2Fkind-v${KIND_VERSION}"

‎jenkinsVzScript.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This script checks for the below required environment variables on Jenkins and runs the integration tests
66
# APACHE_MAVEN_HOME
77
# HELM_VERSION
8-
# KUBECTL_VERSION
8+
# KUBE_VERSION
99
# KIND_VERSION
1010
# IT_TEST
1111
# WDT_DOWNLOAD_URL
@@ -58,7 +58,7 @@ echo "WORKSPACE ${WORKSPACE}"
5858
checkEnvVars \
5959
APACHE_MAVEN_HOME \
6060
HELM_VERSION \
61-
KUBECTL_VERSION \
61+
KUBE_VERSION \
6262
KIND_VERSION \
6363
IT_TEST \
6464
WDT_DOWNLOAD_URL \
@@ -90,7 +90,7 @@ helm version
9090

9191
KCLI="kubectl" # this string has a deliberate exclusion in the 'validateCLI.sh' validation check for direct use of the k8s cli
9292
echo "Info: Set up ${KCLI}..."
93-
curl -Lo "${WORKSPACE}/bin/${KCLI}" "https://objectstorage.us-phoenix-1.oraclecloud.com/n/weblogick8s/b/wko-system-test-files/o/${KCLI}%2F${KCLI}-v${KUBECTL_VERSION}"
93+
curl -Lo "${WORKSPACE}/bin/${KCLI}" "https://objectstorage.us-phoenix-1.oraclecloud.com/n/weblogick8s/b/wko-system-test-files/o/${KCLI}%2F${KCLI}-v${KUBE_VERSION}"
9494
chmod +x ${WORKSPACE}/bin/${KCLI}
9595
${KCLI} version --client=true
9696

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /