@@ -64,6 +64,7 @@ void prepareNode() {
6464 IMAGE_PMM3_CLIENT = IMAGE_PMM3_CLIENT ?: getParam(" IMAGE_PMM3_CLIENT" )
6565 IMAGE_PMM3_SERVER = IMAGE_PMM3_SERVER ?: getParam(" IMAGE_PMM3_SERVER" )
6666 IMAGE_LOGCOLLECTOR = IMAGE_LOGCOLLECTOR ?: getParam(" IMAGE_LOGCOLLECTOR" )
67+ IMAGE_SEARCH = IMAGE_SEARCH ?: getParam(" IMAGE_SEARCH" )
6768 if (" $PLATFORM_VER " . toLowerCase() == " min" || " $PLATFORM_VER " . toLowerCase() == " max" ) {
6869 PLATFORM_VER = getParam(" PLATFORM_VER" , " OPENSHIFT_${ PLATFORM_VER} " )
6970 }
@@ -100,7 +101,7 @@ void prepareNode() {
100101 GIT_SHORT_COMMIT = sh(script : ' git -C source rev-parse --short HEAD' , returnStdout : true ). trim()
101102 CLUSTER_NAME = " psmdbo-${ GIT_SHORT_COMMIT.take(6)} " . toLowerCase()
102103 env. CLUSTER_NAME = CLUSTER_NAME
103- PARAMS_HASH = sh(script : " echo $GIT_BRANCH -$GIT_SHORT_COMMIT -$PLATFORM_VER -$CLUSTER_WIDE -$IMAGE_OPERATOR -$IMAGE_MONGOD -$IMAGE_BACKUP -$IMAGE_PMM_CLIENT -$IMAGE_PMM_SERVER -$IMAGE_PMM3_CLIENT -$IMAGE_PMM3_SERVER -$IMAGE_LOGCOLLECTOR | md5sum | cut -d' ' -f1" , returnStdout : true ). trim()
104+ PARAMS_HASH = sh(script : " echo $GIT_BRANCH -$GIT_SHORT_COMMIT -$PLATFORM_VER -$CLUSTER_WIDE -$IMAGE_OPERATOR -$IMAGE_MONGOD -$IMAGE_BACKUP -$IMAGE_PMM_CLIENT -$IMAGE_PMM_SERVER -$IMAGE_PMM3_CLIENT -$IMAGE_PMM3_SERVER -$IMAGE_LOGCOLLECTOR - $I MAGE_SEARCH | md5sum | cut -d' ' -f1" , returnStdout : true ). trim()
104105}
105106
106107void dockerBuildPush () {
@@ -301,6 +302,7 @@ void runTest(Integer TEST_ID) {
301302 export IMAGE_PMM3_CLIENT=$IMAGE_PMM3_CLIENT
302303 export IMAGE_PMM3_SERVER=$IMAGE_PMM3_SERVER
303304 export IMAGE_LOGCOLLECTOR=$IMAGE_LOGCOLLECTOR
305+ export IMAGE_SEARCH=$IMAGE_SEARCH
304306 export KUBECONFIG=$WORKSPACE /openshift/$clusterSuffix /auth/kubeconfig
305307
306308 oc whoami
@@ -361,6 +363,7 @@ IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER ?: 'e2e_defaults'}
361363IMAGE_PMM3_CLIENT=${ IMAGE_PMM3_CLIENT ?: 'e2e_defaults'}
362364IMAGE_PMM3_SERVER=${ IMAGE_PMM3_SERVER ?: 'e2e_defaults'}
363365IMAGE_LOGCOLLECTOR=${ IMAGE_LOGCOLLECTOR ?: 'e2e_defaults'}
366+ IMAGE_SEARCH=${ IMAGE_SEARCH ?: 'e2e_defaults'}
364367PLATFORM_VER=$PLATFORM_VER """
365368
366369 writeFile file : " TestsReport.xml" , text : testsReport
@@ -451,6 +454,7 @@ pipeline {
451454 string(name : ' IMAGE_PMM3_CLIENT' , defaultValue : ' ' , description : ' ex: perconalab/pmm-client:3-dev-latest' )
452455 string(name : ' IMAGE_PMM3_SERVER' , defaultValue : ' ' , description : ' ex: perconalab/pmm-server:3-dev-latest' )
453456 string(name : ' IMAGE_LOGCOLLECTOR' , defaultValue : ' ' , description : ' ex: perconalab/fluentbit:main-logcollector' )
457+ string(name : ' IMAGE_SEARCH' , defaultValue : ' ' , description : ' ex: perconalab/percona-server-mongodb-operator:main-mongot' )
454458 string(name : ' AWS_REGION' , defaultValue : ' eu-west-3' , description : ' AWS region to use for openshift cluster' )
455459 choice(name : ' DEBUG_TESTS' , choices : [' NO' , ' YES' ], description : ' Run tests with debug' )
456460 choice(name : ' JENKINS_AGENT' , choices : [' Hetzner' , ' AWS' ], description : ' Cloud infra for build' )
0 commit comments