Skip to content

Commit d603a97

Browse files
author
Martin Šplíchal
committed
Update Jenkins Kubernetes cluster URL and namespace
1 parent 724c6e9 commit d603a97

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

tools/jenkins/midpoint-main-generic-oracle-pipeline

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ spec:
8989
resources:
9090
requests:
9191
storage: \${3:-5}\${4:-G}i
92-
storageClassName: csi-rbd-ssd
92+
storageClassName: rbd-delete
9393
volumeMode: Filesystem
9494
EOF
9595
}
@@ -127,10 +127,10 @@ spec:
127127
protocol: TCP
128128
resources:
129129
requests:
130-
memory: "4Gi"
130+
memory: "6Gi"
131131
cpu: "2"
132132
limits:
133-
memory: "4Gi"
133+
memory: "6Gi"
134134
cpu: "2"
135135
env:
136136
- name: ORACLE_CHARACTERSET
@@ -157,17 +157,17 @@ echo
157157
# 20 => 20Gi space, 15 is not enough for our tests and causes errors:
158158
# ORA-00257: Archiver error. Connect AS SYSDBA only until resolved. (Oracle 23ai)
159159
# ORA-01691: unable to extend lob segment MIDPOINT.SYS_LOB... by 1024 in tablespace USERS
160-
createPVC jenkins test-db-${JOB_NAME}-${BUILD_NUMBER} 10 | tee ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpvc
161-
createDBPod jenkins test-db ${JOB_NAME}-${BUILD_NUMBER} test-db-${JOB_NAME}-${BUILD_NUMBER} |
160+
createPVC jenkins-legacy test-db-${JOB_NAME}-${BUILD_NUMBER} 10 | tee ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpvc
161+
createDBPod jenkins-legacy test-db ${JOB_NAME}-${BUILD_NUMBER} test-db-${JOB_NAME}-${BUILD_NUMBER} |
162162
tee ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod
163163
pvcdbname="\$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpvc)"
164164
poddbname="\$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod)"
165165

166-
podIPs="\$(kubectl get -n jenkins \${poddbname} -o=jsonpath="{.status.podIP}{':'}{.status.hostIP}")"
166+
podIPs="\$(kubectl get -n jenkins-legacy \${poddbname} -o=jsonpath="{.status.podIP}{':'}{.status.hostIP}")"
167167
while [ "\${podIPs:0:1}" == ":" ]
168168
do
169169
sleep 5
170-
podIPs="\$(kubectl get -n jenkins \${poddbname} -o=jsonpath="{.status.podIP}{':'}{.status.hostIP}")"
170+
podIPs="\$(kubectl get -n jenkins-legacy \${poddbname} -o=jsonpath="{.status.podIP}{':'}{.status.hostIP}")"
171171
done
172172
poddbIP="\$(echo -n \${podIPs} | cut -d : -f 1)"
173173
hostdbIP="\$(echo -n \${podIPs} | cut -d : -f 2)"
@@ -176,7 +176,7 @@ echo "\${poddbIP}" > ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod-ip
176176

177177
echo
178178

179-
kubectl get -n jenkins \${poddbname} -o=jsonpath="{range .status.conditions[*]}{.type}{': '}{.status}{'\\n'}{end}"
179+
kubectl get -n jenkins-legacy \${poddbname} -o=jsonpath="{range .status.conditions[*]}{.type}{': '}{.status}{'\\n'}{end}"
180180

181181
echo -e "\\nPod IP: \${poddbIP}\\nHost IP: \${hostdbIP}\\n"
182182
"""
@@ -259,22 +259,22 @@ function checkDB {
259259
}
260260

261261
echo -e "\\nWait to DB get up..."
262-
checkDB jenkins test-db-${JOB_NAME}-${BUILD_NUMBER} ../logs-${JOB_NAME}-${BUILD_NUMBER} 0
262+
checkDB jenkins-legacy test-db-${JOB_NAME}-${BUILD_NUMBER} ../logs-${JOB_NAME}-${BUILD_NUMBER} 0
263263

264264
# dd of=... is used because cat > redirect would require some quoting to work on the remote side.
265265
cat config/sql/generic/oracle-*-all.sql repo/repo-sql-impl-test/sql-procedures/oracle.sql |
266-
kubectl exec -i -n jenkins test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- dd of=ora-mp-init.sql
266+
kubectl exec -i -n jenkins-legacy test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- dd of=ora-mp-init.sql
267267

268268
# Inside Oracle container sys/Heslo123@xepdb1 works the same as sys/Heslo123@//localhost:1521/xepdb1
269-
cat <<EOF | kubectl exec -i -n jenkins test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- sqlplus sys/Heslo123@${oraclePDB} as sysdba
269+
cat <<EOF | kubectl exec -i -n jenkins-legacy test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- sqlplus sys/Heslo123@${oraclePDB} as sysdba
270270
CREATE USER midpoint IDENTIFIED BY password;
271271
GRANT connect,resource TO midpoint;
272272
ALTER USER midpoint quota 10G on users;
273273
-- Without ALTER above you'll get ORA-01950: no privileges on tablespace 'USERS'
274274
EOF
275275

276276
# midpoint/password@//localhost:1521/xepdb1 would also work, but not necessary inside Oracle container:
277-
cat <<EOF | kubectl exec -i -n jenkins test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- sqlplus midpoint/password@${oraclePDB}
277+
cat <<EOF | kubectl exec -i -n jenkins-legacy test-db-${JOB_NAME}-${BUILD_NUMBER} -c oracle -- sqlplus midpoint/password@${oraclePDB}
278278
@ora-mp-init.sql
279279
EOF
280280
"""
@@ -338,9 +338,9 @@ EOF
338338
]) {
339339
try {
340340
sh """#!/bin/bash
341-
kubectl logs -n jenkins \$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod) -c oracle > ../logs-${JOB_NAME}-${BUILD_NUMBER}/pod-db-oracle-full.log
341+
kubectl logs -n jenkins-legacy \$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod) -c oracle > ../logs-${JOB_NAME}-${BUILD_NUMBER}/pod-db-oracle-full.log
342342

343-
kubectl delete -n jenkins \\
343+
kubectl delete -n jenkins-legacy \\
344344
\$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpod) \\
345345
\$(cat ../logs-${JOB_NAME}-${BUILD_NUMBER}/dbpvc)
346346
"""

0 commit comments

Comments
 (0)