From 044351da2980060a9adc62343834464b02dbcc31 Mon Sep 17 00:00:00 2001 From: Pavel Tankov <4014969+ptankov@users.noreply.github.com> Date: Mon, 27 Jan 2025 22:00:44 +0200 Subject: [PATCH] Update cloud secret file credential ID and adjust operator image export logic --- cloud/jenkins/pso-gke.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/jenkins/pso-gke.groovy b/cloud/jenkins/pso-gke.groovy index 47365f0834..70fcd771a9 100644 --- a/cloud/jenkins/pso-gke.groovy +++ b/cloud/jenkins/pso-gke.groovy @@ -169,7 +169,7 @@ void initTests() { } } - withCredentials([file(credentialsId: 'cloud-secret-file', variable: 'CLOUD_SECRET_FILE')]) { + withCredentials([file(credentialsId: 'cloud-secret-file-ps', variable: 'CLOUD_SECRET_FILE')]) { sh """ cp $CLOUD_SECRET_FILE source/e2e-tests/conf/cloud-secret.yml """ @@ -261,7 +261,7 @@ void runTest(Integer TEST_ID) { export DEBUG_TESTS=1 [[ "$CLUSTER_WIDE" == "YES" ]] && export OPERATOR_NS=ps-operator - export IMAGE=$IMAGE_OPERATOR + [[ "$OPERATOR_IMAGE" ]] && export IMAGE=$OPERATOR_IMAGE || export IMAGE=perconalab/percona-server-mysql-operator:$GIT_BRANCH export IMAGE_MYSQL=$IMAGE_MYSQL export IMAGE_BACKUP=$IMAGE_BACKUP export IMAGE_ROUTER=$IMAGE_ROUTER