Skip to content

Commit 503a03f

Browse files
rjeberhardrjeberhard
committed
Merge branch 'sync-Jenkinsfile' into 'main'
Update Jenkinsfile to sync with Jenkinsfile.podman See merge request weblogic-cloud/weblogic-kubernetes-operator!5034
2 parents cf94776 + 97c86bc commit 503a03f

File tree

1 file changed

+51
-45
lines changed

1 file changed

+51
-45
lines changed

‎Jenkinsfile‎

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
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.23.0': [
6-
'1.30.0': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e',
7-
'1.30': 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e',
8-
'1.29.4': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8',
9-
'1.29': 'kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8',
10-
'1.28.9': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0',
11-
'1.28': 'kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0',
12-
'1.27.13': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8',
13-
'1.27': 'kindest/node:v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8',
14-
'1.26.15': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19',
15-
'1.26': 'kindest/node:v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19',
16-
'1.25.16': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b',
17-
'1.25': 'kindest/node:v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b'
5+
'0.30.0': [
6+
'1.34.0': 'kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a',
7+
'1.34': 'kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a',
8+
'1.33.4': 'kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2',
9+
'1.33': 'kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2',
10+
'1.32.8': 'kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1',
11+
'1.32': 'kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1',
12+
'1.31.12': 'kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2',
13+
'1.31': 'kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2'
1814
]
1915
]
2016
def _kind_image = null
@@ -68,29 +64,25 @@ pipeline {
6864
string(name: 'OPERATOR_LOG_LEVEL',
6965
description: 'The default log level is not set',
7066
defaultValue: ''
71-
)
67+
)
7268
choice(name: 'KIND_VERSION',
7369
description: 'Kind version.',
7470
choices: [
75-
'0.23.0'
71+
'0.30.0'
7672
]
7773
)
7874
choice(name: 'KUBE_VERSION',
79-
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.23.0: 1.30, 1.30.0, 1.29, 1.29.4, 1.28, 1.28.9, 1.27, 1.27.13, 1.26, 1.26.15, 1.25, 1.25.16 ',
75+
description: 'Kubernetes version. Supported values depend on the Kind version. Kind 0.30.0: 1.34.0, 1,34, 1.33.4, 1.33, 1.32.8, 1.32, 1.31.12, 1.31 ',
8076
choices: [
8177
// The first item in the list is the default value...
82-
'1.30.0',
83-
'1.30',
84-
'1.29.4',
85-
'1.29',
86-
'1.28.9',
87-
'1.28',
88-
'1.27.13',
89-
'1.27',
90-
'1.26.15',
91-
'1.26',
92-
'1.25.16',
93-
'1.25'
78+
'1.34.0',
79+
'1.34',
80+
'1.33.4',
81+
'1.33',
82+
'1.32.8',
83+
'1.32',
84+
'1.31.12',
85+
'1.31'
9486
]
9587
)
9688
string(name: 'HELM_VERSION',
@@ -100,7 +92,7 @@ pipeline {
10092
choice(name: 'ISTIO_VERSION',
10193
description: 'Istio version',
10294
choices: [
103-
'1.23.0',
95+
'1.23.0',
10496
'1.17.2',
10597
'1.16.1',
10698
'1.13.2',
@@ -143,7 +135,7 @@ pipeline {
143135
defaultValue: "test-images/weblogic"
144136
)
145137
string(name: 'WEBLOGIC_IMAGE_TAG',
146-
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
138+
description: '14.1.2.0-generic-jdk17-ol8, 14.1.2.0-generic-jdk17-ol9, 14.1.2.0-generic-jdk21-ol8, 14.1.2.0-generic-jdk21-ol9, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8',
147139
defaultValue: '14.1.2.0-generic-jdk17-ol8'
148140
)
149141
string(name: 'FMWINFRA_IMAGE_NAME',
@@ -160,7 +152,7 @@ pipeline {
160152
)
161153
string(name: 'DB_IMAGE_TAG',
162154
description: 'Oracle DB image tag',
163-
defaultValue: '12.2.0.1-slim'
155+
defaultValue: '19.3.0.0'
164156
)
165157
string(name: 'MONITORING_EXPORTER_BRANCH',
166158
description: '',
@@ -234,7 +226,13 @@ pipeline {
234226
error('KIND_VERSION or KUBE_VERSION were null')
235227
}
236228
echo "Kind Image = ${_kind_image}"
229+
if (env.JOB_NAME == 'wko-kind-k8sversion') {
230+
currentBuild.description = "${GIT_BRANCH} ${KUBE_VERSION}"
231+
} else {
232+
currentBuild.description = "${GIT_BRANCH} ${MAVEN_PROFILE_NAME}"
233+
}
237234
}
235+
238236
}
239237
}
240238

@@ -330,15 +328,16 @@ pipeline {
330328
steps {
331329
sh '''
332330
export PATH=${runtime_path}
333-
running="$(docker inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
331+
332+
running="$(podman container inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
334333
if [ "${running}" = 'true' ]; then
335334
echo "Stopping the registry container ${registry_name}"
336-
docker stop "${registry_name}"
337-
docker rm --force "${registry_name}"
335+
podman stop "${registry_name}"
336+
podman rm --force "${registry_name}"
338337
fi
339338
340-
docker run -d --restart=always -p "127.0.0.1:${registry_port}:5000" --name "${registry_name}" \
341-
${ocir_host}/${wko_tenancy}/test-images/docker/registry:2
339+
podman run -d --restart=always -p "127.0.0.1:${registry_port}:5000" --name "${registry_name}" \
340+
${ocir_host}/${wko_tenancy}/test-images/docker/registry:2.8.2
342341
echo "Registry Host: ${registry_host}"
343342
'''
344343
}
@@ -458,6 +457,10 @@ nodes:
458457
hostPort: 2224
459458
- containerPort: 31128
460459
hostPort: 2228
460+
- containerPort: 31132
461+
hostPort: 8001
462+
- containerPort: 31136
463+
hostPort: 2232
461464
extraMounts:
462465
- hostPath: ${pv_root}
463466
containerPath: ${pv_root}
@@ -476,6 +479,7 @@ EOF
476479
for node in $(kind get nodes --name "${kind_name}"); do
477480
kubectl annotate node ${node} tilt.dev/registry=localhost:${registry_port};
478481
done
482+
podman exec -it kind-worker bash -c "sysctl vm.max_map_count"
479483
480484
# Document the local registry
481485
# https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry
@@ -500,6 +504,7 @@ EOF
500504
}
501505
steps {
502506
script {
507+
503508
def res = 0
504509
res = sh(script: '''
505510
if [ -z "${IT_TEST}" ] && [ "${MAVEN_PROFILE_NAME}" = "integration-tests" ]; then
@@ -523,12 +528,12 @@ EOF
523528
PARALLEL_RUN='false'
524529
elif [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then
525530
PARALLEL_RUN='false'
526-
elif [ -n "${IT_TEST}" ]; then
531+
fi
532+
if [ -n "${IT_TEST}" ]; then
527533
echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)'
528534
MAVEN_PROFILE_NAME="integration-tests"
529535
echo "-Dit.test=\"${IT_TEST}\"" >> ${WORKSPACE}/.mvn/maven.config
530536
fi
531-
echo "-Dmaven.wagon.http.retryHandler.count=3" >> ${WORKSPACE}/.mvn/maven.config
532537
echo "-Dwko.it.wle.download.url=\"${wle_download_url}\"" >> ${WORKSPACE}/.mvn/maven.config
533538
echo "-Dwko.it.result.root=\"${result_root}\"" >> ${WORKSPACE}/.mvn/maven.config
534539
echo "-Dwko.it.pv.root=\"${pv_root}\"" >> ${WORKSPACE}/.mvn/maven.config
@@ -558,11 +563,11 @@ EOF
558563
echo "-Dwko.it.remoteconsole.version=\"${REMOTECONSOLE_VERSION}\"" >> ${WORKSPACE}/.mvn/maven.config
559564
echo "-Djdk.httpclient.allowRestrictedHeaders=\"host\"" >> ${WORKSPACE}/.mvn/maven.config
560565
echo "-DOPERATOR_LOG_LEVEL=\"${OPERATOR_LOG_LEVEL}\"" >> ${WORKSPACE}/.mvn/maven.config
566+
echo "-Dwko.it.install.weblogic=\"true\"" >> ${WORKSPACE}/.mvn/maven.config
561567
562568
echo "${WORKSPACE}/.mvn/maven.config contents:"
563569
cat "${WORKSPACE}/.mvn/maven.config"
564570
cp "${WORKSPACE}/.mvn/maven.config" "${result_root}"
565-
kubectl describe node kind-worker
566571
'''
567572
withMaven(globalMavenSettingsConfig: 'wkt-maven-settings-xml', publisherStrategy: 'EXPLICIT') {
568573
withCredentials([
@@ -594,10 +599,10 @@ EOF
594599
if ! kind export logs "${result_root}/kubelogs" --name "${kind_name}" --verbosity 99; then
595600
echo "Failed to export kind logs for kind cluster ${kind_name}"
596601
fi
597-
if ! docker exec kind-worker journalctl --utc --dmesg --system > "${result_root}/journalctl-kind-worker.out"; then
602+
if ! podman exec kind-worker journalctl --utc --dmesg --system > "${result_root}/journalctl-kind-worker.out"; then
598603
echo "Failed to run journalctl for kind worker"
599604
fi
600-
if ! docker exec kind-control-plane journalctl --utc --dmesg --system > "${result_root}/journalctl-kind-control-plane.out"; then
605+
if ! podman exec kind-control-plane journalctl --utc --dmesg --system > "${result_root}/journalctl-kind-control-plane.out"; then
601606
echo "Failed to run journalctl for kind control plane"
602607
fi
603608
if ! journalctl --utc --dmesg --system --since "$start_time" > "${result_root}/journalctl-compute.out"; then
@@ -608,7 +613,7 @@ EOF
608613
sudo mv -f ${result_root}/* "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
609614
'''
610615
archiveArtifacts(artifacts:
611-
"logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/**/*,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/**/*")
616+
"logdir/${BUILD_TAG}/wl_k8s_test_results/diagnostics/**/*,logdir/${BUILD_TAG}/wl_k8s_test_results/workdir/liftandshiftworkdir/**/*,integration-tests/target/failsafe-reports/*.xml")
612617
junit(testResults: 'integration-tests/target/failsafe-reports/*.xml', allowEmptyResults: true)
613618
}
614619
}
@@ -618,16 +623,17 @@ EOF
618623
always {
619624
sh '''
620625
export PATH="${WORKSPACE}/bin:${PATH}"
621-
running="$(docker inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
626+
running="$(podman container inspect -f '{{.State.Running}}' "${registry_name}" 2>/dev/null || true)"
622627
if [ "${running}" = 'true' ]; then
623628
echo "Stopping the registry container ${registry_name}"
624-
docker stop "${registry_name}"
625-
docker rm --force "${registry_name}"
629+
podman stop "${registry_name}"
630+
podman rm --force "${registry_name}"
626631
fi
627632
echo 'Remove old Kind cluster (if any)...'
628633
if ! kind delete cluster --name ${kind_name} --kubeconfig "${kubeconfig_file}"; then
629634
echo "Failed to delete kind cluster ${kind_name}"
630635
fi
636+
sudo chown -R $(whoami) ${WORKSPACE}
631637
'''
632638
}
633639
}

0 commit comments

Comments
 (0)