Skip to content

Commit 9805288

Browse files
authored
K8SPSMDB-1498 Update Versions and Tests for 1.22.0 Release (#2249)
* K8SPSMDB-1498 Update Versions and Tests for 1.22.0 Release * Fix tests * add docker.io to awscli images
1 parent 1fc1e8b commit 9805288

39 files changed

Lines changed: 164 additions & 55 deletions

File tree

Jenkinsfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
region = 'us-central1-a'
2-
testUrlPrefix = 'https://percona-jenkins-artifactory-public.s3.amazonaws.com/cloud-psmdb-operator'
3-
tests = []
1+
import groovy.transform.Field
2+
3+
@Field def region = 'us-central1-a'
4+
@Field def testUrlPrefix = 'https://percona-jenkins-artifactory-public.s3.amazonaws.com/cloud-psmdb-operator'
5+
@Field def tests = []
46

57
void createCluster(String CLUSTER_SUFFIX) {
68
withCredentials([string(credentialsId: 'GCP_PROJECT_ID', variable: 'GCP_PROJECT'), file(credentialsId: 'gcloud-key-file', variable: 'CLIENT_SECRET_FILE')]) {
@@ -182,8 +184,8 @@ String formatTime(def time) {
182184
}
183185
}
184186

185-
TestsReport = '| Test Name | Result | Time |\r\n| ----------- | -------- | ------ |'
186-
TestsReportXML = '<testsuite name=\\"PSMDB\\">\n'
187+
@Field def TestsReport = '| Test Name | Result | Time |\r\n| ----------- | -------- | ------ |'
188+
@Field def TestsReportXML = '<testsuite name=\\"PSMDB\\">\n'
187189

188190
void makeReport() {
189191
def wholeTestAmount = tests.size()
@@ -290,7 +292,7 @@ void prepareNode() {
290292
sudo curl -sLo /usr/local/bin/kubectl https://dl.k8s.io/release/\$(curl -Ls https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl && sudo chmod +x /usr/local/bin/kubectl
291293
kubectl version --client --output=yaml
292294
293-
curl -fsSL https://get.helm.sh/helm-v3.19.0-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm
295+
curl -fsSL https://get.helm.sh/helm-v3.20.0-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm
294296
295297
sudo curl -fsSL https://github.com/mikefarah/yq/releases/download/v4.48.1/yq_linux_amd64 -o /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
296298
sudo curl -fsSL https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 -o /usr/local/bin/jq && sudo chmod +x /usr/local/bin/jq
@@ -344,7 +346,7 @@ boolean isManualBuild() {
344346
return !causes.isEmpty()
345347
}
346348

347-
needToRunTests = true
349+
@Field def needToRunTests = true
348350
void checkE2EIgnoreFiles() {
349351
if (isManualBuild()) {
350352
echo "This is a manual rebuild. Forcing pipeline execution."
@@ -423,9 +425,9 @@ pipeline {
423425
CLOUDSDK_CORE_DISABLE_PROMPTS = 1
424426
CLEAN_NAMESPACE = 1
425427
OPERATOR_NS = 'psmdb-operator'
426-
GIT_SHORT_COMMIT = sh(script: 'git rev-parse --short HEAD', , returnStdout: true).trim()
428+
GIT_SHORT_COMMIT = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
427429
VERSION = "${env.GIT_BRANCH}-${env.GIT_SHORT_COMMIT}"
428-
CLUSTER_NAME = sh(script: "echo jen-psmdb-${env.CHANGE_ID}-${GIT_SHORT_COMMIT}-${env.BUILD_NUMBER} | tr '[:upper:]' '[:lower:]'", , returnStdout: true).trim()
430+
CLUSTER_NAME = sh(script: "echo jen-psmdb-${env.CHANGE_ID}-${GIT_SHORT_COMMIT}-${env.BUILD_NUMBER} | tr '[:upper:]' '[:lower:]'", returnStdout: true).trim()
429431
AUTHOR_NAME = sh(script: "echo ${CHANGE_AUTHOR_EMAIL} | awk -F'@' '{print \$1}'", , returnStdout: true).trim()
430432
ENABLE_LOGGING = "true"
431433
}

deploy/cr-minimal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: minimal-cluster
55
spec:
66
crVersion: 1.22.0
7-
image: percona/percona-server-mongodb:8.0.17-6
7+
image: percona/percona-server-mongodb:8.0.19-7
88
unsafeFlags:
99
replsetSize: true
1010
mongosSize: true

deploy/cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
# growthStep: 2Gi
2222
# maxSize: "10Gi"
2323
crVersion: 1.22.0
24-
image: percona/percona-server-mongodb:8.0.17-6
24+
image: percona/percona-server-mongodb:8.0.19-7
2525
imagePullPolicy: Always
2626
# tls:
2727
# mode: preferTLS

e2e-tests/balancer/run

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ main() {
131131
check_balancer ${cluster} "true" 10
132132

133133
destroy "$namespace"
134+
135+
desc 'test passed'
134136
}
135137

136138
main

e2e-tests/conf/client-70.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
terminationGracePeriodSeconds: 10
1616
containers:
1717
- name: psmdb-client
18-
image: percona/percona-server-mongodb:7.0
18+
image: docker.io/percona/percona-server-mongodb:7.0
1919
imagePullPolicy: Always
2020
command:
2121
- sleep

e2e-tests/conf/client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
terminationGracePeriodSeconds: 10
1616
containers:
1717
- name: psmdb-client
18-
image: percona/percona-server-mongodb:4.4
18+
image: docker.io/percona/percona-server-mongodb:4.4
1919
imagePullPolicy: Always
2020
command:
2121
- sleep

e2e-tests/conf/client_with_tls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
terminationGracePeriodSeconds: 10
1616
containers:
1717
- name: psmdb-client
18-
image: percona/percona-server-mongodb:4.4
18+
image: docker.io/percona/percona-server-mongodb:4.4
1919
imagePullPolicy: Always
2020
command: ["/bin/bash","-c","cat /etc/mongodb-ssl/tls.key /etc/mongodb-ssl/tls.crt > /tmp/tls.pem && sleep 100500"]
2121
volumeMounts:

e2e-tests/custom-replset-name/run

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,5 @@ sleep 120
5454
wait_restore $backup_name_minio $cluster "ready"
5555

5656
destroy $namespace
57+
58+
desc 'test passed'

e2e-tests/demand-backup-if-unhealthy/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ rollback_invalid_image() {
7474

7575
echo
7676
echo "Deleting crashing pod $cluster_name-rs0-2"
77-
kubectl_bin delete pod "$cluster_name-rs0-2"
77+
kubectl_bin delete pod "$cluster_name-rs0-2" --wait=false
7878
}
7979

8080
is_sts_ready() {

e2e-tests/demand-backup-sharded/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ check_data
215215
desc 'delete backup and check if it is removed from bucket -- minio'
216216
kubectl_bin delete psmdb-backup --all
217217

218-
backup_exists=$(kubectl_bin run -i --rm aws-cli --image=perconalab/awscli --restart=Never -- \
218+
backup_exists=$(kubectl_bin run -i --rm aws-cli --image=docker.io/perconalab/awscli --restart=Never -- \
219219
/usr/bin/env AWS_ACCESS_KEY_ID=some-access-key AWS_SECRET_ACCESS_KEY=some-secret-key AWS_DEFAULT_REGION=us-east-1 \
220220
/usr/bin/aws --endpoint-url http://minio-service:9000 s3 ls s3://operator-testing/ \
221221
| grep -c ${backup_dest_minio}_ | cat)

0 commit comments

Comments
 (0)