diff --git a/pbm/pbm-functional-tests.groovy b/pbm/pbm-functional-tests.groovy index bfe7db11cc..6c10d447d4 100644 --- a/pbm/pbm-functional-tests.groovy +++ b/pbm/pbm-functional-tests.groovy @@ -53,9 +53,11 @@ pipeline { 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 """ + + git clone https://github.com/Percona-QA/psmdb-testing + cd psmdb-testing + git checkout ${params.TESTING_BRANCH} + cd pbm-functional/pytest docker-compose build docker-compose up -d diff --git a/psmdb/psmdb-docker-arm.groovy b/psmdb/psmdb-docker-arm.groovy index 02e2fe9e93..009ab2524a 100644 --- a/psmdb/psmdb-docker-arm.groovy +++ b/psmdb/psmdb-docker-arm.groovy @@ -234,7 +234,7 @@ pipeline { PBM_RELEASE=\$(cd percona-backup-mongodb && git branch -r | grep release | sed 's|origin/||' | sort --version-sort | tail -1) echo \$PBM_RELEASE """).trim() - build job: 'pbm-functional-tests', propagate: false, wait: false, parameters: [string(name: 'PBM_BRANCH', value: pbm_branch ), string(name: 'PSMDB', value: psmdb_image ), string(name: 'instance', value: 'docker-64gb-aarch64')] + build job: 'pbm-functional-tests', propagate: false, wait: false, parameters: [string(name: 'PBM_BRANCH', value: pbm_branch ), string(name: 'PSMDB', value: psmdb_image ), string(name: 'instance', value: 'docker-64gb-aarch64'), string(name: 'TESTING_BRANCH', value: "pbm-${pbm_branch}")] } } } diff --git a/psmdb/psmdb-docker.groovy b/psmdb/psmdb-docker.groovy index cd7e75a3eb..6811e6227c 100644 --- a/psmdb/psmdb-docker.groovy +++ b/psmdb/psmdb-docker.groovy @@ -168,7 +168,7 @@ pipeline { PBM_RELEASE=\$(cd percona-backup-mongodb && git branch -r | grep release | sed 's|origin/||' | sort --version-sort | tail -1) echo \$PBM_RELEASE """).trim() - build job: 'pbm-functional-tests', propagate: false, wait: false, parameters: [string(name: 'PBM_BRANCH', value: pbm_branch ), string(name: 'PSMDB', value: psmdb_image )] + build job: 'pbm-functional-tests', propagate: false, wait: false, parameters: [string(name: 'PBM_BRANCH', value: pbm_branch ), string(name: 'PSMDB', value: psmdb_image ), string(name: 'TESTING_BRANCH', value: "pbm-${pbm_branch}")] } } }