PBM add tests for arm, upgrade instances (#2535)

Percona-Lab · Mar 1, 2024 · f21b33f · f21b33f
1 parent 428b974
commit f21b33f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/pbm/pbm-functional-tests-full.groovy b/pbm/pbm-functional-tests-full.groovy
@@ -13,6 +13,7 @@ pipeline {
     parameters {
         string(name: 'PBM_BRANCH', defaultValue: 'main', description: 'PBM branch or commit')
         string(name: 'GO_VER', defaultValue: 'bullseye', description: 'GOLANG docker image for building PBM from sources')
+        choice(name: 'instance', choices: ['docker-64gb','docker-64gb-aarch64'], description: 'Ec2 instance type for running tests')
         choice(name: 'JIRA_REPORT', choices: ['no','yes'], description: 'Send report to jira')
         string(name: 'TEST_CYCLE_NAME', defaultValue: 'test', description: 'Jira test cycle name')
         string(name: 'TESTING_BRANCH', defaultValue: 'main', description: 'psmdb-testing repo branch')
@@ -28,7 +29,7 @@ pipeline {
         stage ('Run tests') {
             matrix {
                 agent {
-                    label 'docker-32gb'
+                    label "${params.instance}"
                 }
                 axes {
                     axis {
@@ -50,14 +51,18 @@ pipeline {
                                     docker rmi -f \$(docker images -q | uniq) || true
                                     sudo rm -rf ./*
                                     if [ ! -f "/usr/local/bin/docker-compose" ] ; then
-                                        sudo curl -SL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+                                        if [ ${params.instance} = "docker-64gb-aarch64" ]; then
+                                            sudo curl -SL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64 -o /usr/local/bin/docker-compose
+                                        else
+                                            sudo curl -SL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+                                        fi
                                         sudo chmod +x /usr/local/bin/docker-compose
                                     fi
                                 """ 
                                 git poll: false, branch: params.TESTING_BRANCH, url: 'https://github.com/Percona-QA/psmdb-testing.git'
                                 sh """
                                     cd pbm-functional/pytest
-                                    PSMDB=percona/percona-server-mongodb:${PSMDB} docker-compose build
+                                    PSMDB=percona/percona-server-mongodb:${PSMDB}-multi docker-compose build
                                     docker-compose up -d
                                     if [ ${params.JIRA_REPORT} = "yes" ]; then
                                         export JIRA_SERVER=https://jira.percona.com