From c36eb1d763058962a6772eabc9ea71668d10ac2c Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Mon, 13 Jun 2022 21:12:52 +0530 Subject: [PATCH 01/14] PMM-9610 Adding job for dbaas Upgrade --- pmm/pmm2-dbaas-upgrade-tests.groovy | 248 ++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 pmm/pmm2-dbaas-upgrade-tests.groovy diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy new file mode 100644 index 0000000000..9819e33167 --- /dev/null +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -0,0 +1,248 @@ +library changelog: false, identifier: 'lib@master', retriever: modernSCM([ + $class: 'GitSCMSource', + remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' +]) _ + +void runStagingServer(String DOCKER_VERSION, CLIENT_VERSION, VERSION_SERVICE_VERSION, ADMIN_PASSWORD) { + stagingJob = build job: 'aws-staging-start', parameters: [ + string(name: 'DOCKER_VERSION', value: DOCKER_VERSION), + string(name: 'CLIENT_VERSION', value: CLIENT_VERSION), + string(name: 'VERSION_SERVICE_VERSION', value: VERSION_SERVICE_VERSION), + string(name: 'DOCKER_ENV_VARIABLE', value: ' -e ENABLE_DBAAS=1' ), + string(name: 'NOTIFY', value: 'false'), + string(name: 'DAYS', value: '1'), + string(name: 'ADMIN_PASSWORD', value: ADMIN_PASSWORD) + ] + env.VM_IP = stagingJob.buildVariables.IP + env.VM_NAME = stagingJob.buildVariables.VM_NAME + env.PMM_URL = "http://admin:${ADMIN_PASSWORD}@${VM_IP}" + env.PMM_UI_URL = "http://${VM_IP}/" +} + +void runClusterStaging(String PMM_QA_GIT_BRANCH) { + clusterJob = build job: 'kubernetes-cluster-staging', parameters: [ + string(name: 'NOTIFY', value: 'false'), + string(name: 'PMM_QA_GIT_BRANCH', value: PMM_QA_GIT_BRANCH), + string(name: 'DAYS', value: '1') + ] + env.CLUSTER_IP = clusterJob.buildVariables.IP + env.KUBECONFIG = clusterJob.buildVariables.KUBECONFIG +} + +void destroyStaging(IP) { + build job: 'aws-staging-stop', parameters: [ + string(name: 'VM', value: IP), + ] +} + +def latestVersion = pmmVersion() +def versionsList = pmmVersion('list') + +pipeline { + agent { + label 'docker' + } + parameters { + string( + defaultValue: 'main', + description: 'Tag/Branch for pmm-ui-tests repository', + name: 'GIT_BRANCH') + string( + defaultValue: '', + description: 'Commit hash for the branch', + name: 'GIT_COMMIT_HASH') + choice( + choices: versionsList, + description: 'PMM Server Version to test for Upgrade', + name: 'DOCKER_VERSION') + choice( + choices: versionsList, + description: 'PMM Client Version to test for Upgrade', + name: 'CLIENT_VERSION') + string( + defaultValue: latestVersion, + description: 'latest PMM Server Version', + name: 'PMM_SERVER_LATEST') + string( + defaultValue: 'perconalab/pmm-server:dev-latest', + description: 'PMM Server Tag to be Upgraded to via Docker way Upgrade', + name: 'PMM_SERVER_TAG') + string( + defaultValue: 'admin-password', + description: 'pmm-server admin user default password', + name: 'ADMIN_PASSWORD') + choice( + choices: ['dev','prod'], + description: 'Prod or Dev version service', + name: 'VERSION_SERVICE_VERSION') + string( + defaultValue: "'@dbaas-upgrade'", + description: 'Pass test tags ex. @dbaas-upgrade', + name: 'TEST_TAGS') + string( + defaultValue: 'main', + description: 'Tag/Branch for pmm-qa repository', + name: 'PMM_QA_GIT_BRANCH') + choice( + choices: ['Experimental', 'Testing'], + description: "Select Testing (RC Tesing) or Experimental (dev-latest testing) Repository", + name: 'PMM_REPOSITORY') + } + options { + skipDefaultCheckout() + } + stages { + stage('Prepare') { + steps { + // clean up workspace and fetch pmm-ui-tests repository + deleteDir() + git poll: false, branch: GIT_BRANCH, url: 'https://github.com/percona/pmm-ui-tests.git' + + installDocker() + setupDockerCompose() + sh ''' + docker-compose --version + sudo yum -y update --security + sudo yum -y install php php-mysqlnd php-pdo jq svn bats mysql + curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" + sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl + sudo amazon-linux-extras install epel -y + sudo mkdir -p /srv/pmm-qa || : + pushd /srv/pmm-qa + sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git . + sudo git checkout \${PMM_QA_GIT_COMMIT_HASH} + sudo chmod 755 pmm-tests/install-google-chrome.sh + bash ./pmm-tests/install-google-chrome.sh + popd + sudo ln -s /usr/bin/google-chrome-stable /usr/bin/chromium + ''' + } + } + stage('Checkout Commit') { + when { + expression { env.GIT_COMMIT_HASH.length()>0 } + } + steps { + sh 'git checkout ' + env.GIT_COMMIT_HASH + } + } + stage('Setup PMM Server') { + parallel { + stage('Start Server') { + steps { + runStagingServer('percona/pmm-server:' + DOCKER_VERSION, CLIENT_VERSION, VERSION_SERVICE_VERSION, ADMIN_PASSWORD) + } + } + stage('Start PMM Cluster Staging Instance') { + steps { + runClusterStaging('main') + } + } + } + } + stage('Setup') { + parallel { + stage('Sanity check') { + + steps { + sleep 120 + sh 'timeout 100 bash -c \'while [[ "$(curl -s -o /dev/null -w \'\'%{http_code}\'\' \${PMM_URL}/ping)" != "200" ]]; do sleep 5; done\' || false' + } + } + stage('Setup Node') { + steps { + setupNodejs() + sh """ + sudo yum install -y gettext + envsubst < env.list > env.generated.list + """ + } + } + } + } + stage('Enable Testing Repo') { + when { + expression { env.PMM_REPOSITORY == "Testing"} + } + steps{ + withCredentials([sshUserPrivateKey(credentialsId: 'aws-jenkins', keyFileVariable: 'KEY_PATH', passphraseVariable: '', usernameVariable: 'USER')]) { + sh """ + ssh -i "${KEY_PATH}" -o ConnectTimeout=1 -o StrictHostKeyChecking=no ${USER}@${VM_IP} ' + docker exec ${VM_NAME}-server sed -i'' -e 's^/release/^/testing/^' /etc/yum.repos.d/pmm2-server.repo + docker exec ${VM_NAME}-server percona-release enable percona testing + docker exec ${VM_NAME}-server yum clean all + ' + """ + } + } + } + stage('Enable Experimental Repo') { + when { + expression { env.PMM_REPOSITORY == "Experimental"} + } + steps{ + withCredentials([sshUserPrivateKey(credentialsId: 'aws-jenkins', keyFileVariable: 'KEY_PATH', passphraseVariable: '', usernameVariable: 'USER')]) { + sh """ + ssh -i "${KEY_PATH}" -o ConnectTimeout=1 -o StrictHostKeyChecking=no ${USER}@${VM_IP} ' + docker exec ${VM_NAME}-server yum update -y percona-release + docker exec ${VM_NAME}-server sed -i'' -e 's^/release/^/experimental/^' /etc/yum.repos.d/pmm2-server.repo + docker exec ${VM_NAME}-server percona-release enable percona experimental + docker exec ${VM_NAME}-server yum clean all + ' + """ + } + } + } + stage('Run UI Tests Docker') { + options { + timeout(time: 150, unit: "MINUTES") + } + steps { + withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'PMM_AWS_DEV', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) { + sh """ + sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js + export PWD=\$(pwd); + export CHROMIUM_PATH=/usr/bin/chromium + export kubeconfig_minikube="${KUBECONFIG}" + echo "${KUBECONFIG}" > kubeconfig + export KUBECONFIG=./kubeconfig + kubectl get nodes + ./node_modules/.bin/codeceptjs run-multiple parallel --steps --reporter mocha-multi -c pr.codecept.js --grep ${TEST_TAGS} + """ + } + } + } + } + post { + always { + // stop staging + sh ''' + curl --insecure ${PMM_URL}/logs.zip --output logs.zip || true + ''' + script { + if (currentBuild.result == null || currentBuild.result == 'SUCCESS') { + junit 'tests/output/*.xml' + slackSend channel: '#pmm-ci', color: '#00FF00', message: "[${JOB_NAME}]: build finished - ${BUILD_URL} " + archiveArtifacts artifacts: 'logs.zip' + } else { + junit 'tests/output/*.xml' + slackSend channel: '#pmm-ci', color: '#FF0000', message: "[${JOB_NAME}]: build ${currentBuild.result} - ${BUILD_URL}" + archiveArtifacts artifacts: 'logs.zip' + archiveArtifacts artifacts: 'tests/output/*.png' + } + } + allure([ + includeProperties: false, + jdk: '', + properties: [], + reportBuildPolicy: 'ALWAYS', + results: [[path: 'tests/output/allure']] + ]) + sh ''' + sudo rm -r node_modules/ + sudo rm -r tests/output + ''' + deleteDir() + } + } +} From eea3839d1a7240e8699b76290b68fec61aa6c544 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Mon, 13 Jun 2022 21:15:53 +0530 Subject: [PATCH 02/14] PMM-9610 Destroy Staging --- pmm/pmm2-dbaas-upgrade-tests.groovy | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 9819e33167..cb91bab92e 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -219,6 +219,16 @@ pipeline { sh ''' curl --insecure ${PMM_URL}/logs.zip --output logs.zip || true ''' + script { + if(env.VM_NAME) + { + destroyStaging(VM_IP) + } + if(env.CLUSTER_IP) + { + destroyStaging(CLUSTER_IP) + } + } script { if (currentBuild.result == null || currentBuild.result == 'SUCCESS') { junit 'tests/output/*.xml' From a7b3e07fbc96a4709e94bbd427b56a54006609c6 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Tue, 14 Jun 2022 11:26:10 +0530 Subject: [PATCH 03/14] PMM-9610 Adding the result files --- pmm/pmm2-dbaas-upgrade-tests.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index cb91bab92e..105a299cbb 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -230,15 +230,17 @@ pipeline { } } script { + env.PATH_TO_REPORT_RESULTS = 'tests/output/parallel_chunk*/*.xml' if (currentBuild.result == null || currentBuild.result == 'SUCCESS') { - junit 'tests/output/*.xml' + junit env.PATH_TO_REPORT_RESULTS slackSend channel: '#pmm-ci', color: '#00FF00', message: "[${JOB_NAME}]: build finished - ${BUILD_URL} " archiveArtifacts artifacts: 'logs.zip' } else { - junit 'tests/output/*.xml' + junit env.PATH_TO_REPORT_RESULTS slackSend channel: '#pmm-ci', color: '#FF0000', message: "[${JOB_NAME}]: build ${currentBuild.result} - ${BUILD_URL}" archiveArtifacts artifacts: 'logs.zip' archiveArtifacts artifacts: 'tests/output/*.png' + archiveArtifacts artifacts: 'tests/output/parallel_chunk*/*.png' } } allure([ From e0a352353abb782cd45cc1c6da7daec954f774c2 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Tue, 14 Jun 2022 13:06:04 +0530 Subject: [PATCH 04/14] PMM-9610 adding support for dbaas Matrix --- vars/pmmVersion.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vars/pmmVersion.groovy b/vars/pmmVersion.groovy index 8990aeb07a..ab42853d7d 100644 --- a/vars/pmmVersion.groovy +++ b/vars/pmmVersion.groovy @@ -27,5 +27,7 @@ def call(type='latest') { return versionsList case 'list_with_old': return oldVersions + versionsList + case 'dbaas': + return ['2.23.0', '2.24.0', '2.25.0', '2.26.0', '2.27.0', '2.28.0'] } } From 6df02aed7bf1bdd659caad9e713c93f20c6295ff Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Tue, 14 Jun 2022 14:17:33 +0530 Subject: [PATCH 05/14] PMM-9610 adding matrix job --- pmm/pmm2-dbaas-upgrade-tests-matrix.groovy | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 pmm/pmm2-dbaas-upgrade-tests-matrix.groovy diff --git a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy new file mode 100644 index 0000000000..281f5b4484 --- /dev/null +++ b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy @@ -0,0 +1,106 @@ +library changelog: false, identifier: 'lib@master', retriever: modernSCM([ + $class: 'GitSCMSource', + remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' +]) _ +void runDbaaSUpgradeTests(String GIT_BRANCH, DOCKER_VERSION, CLIENT_VERSION, PMM_SERVER_LATEST, VERSION_SERVICE_VERSION, PMM_REPOSITORY, PMM_QA_GIT_BRANCH) { + upgradeJob = build job: 'pmm2-dbaas-upgrade-tests', parameters: [ + string(name: 'GIT_BRANCH', value: GIT_BRANCH), + string(name: 'DOCKER_VERSION', value: DOCKER_VERSION), + string(name: 'CLIENT_VERSION', value: CLIENT_VERSION), + string(name: 'PMM_SERVER_LATEST', value: PMM_SERVER_LATEST), + string(name: 'VERSION_SERVICE_VERSION', value: VERSION_SERVICE_VERSION), + string(name: 'PMM_REPOSITORY', value: PMM_REPOSITORY), + string(name: 'PMM_QA_GIT_BRANCH', value: PMM_QA_GIT_BRANCH) + ] +} + +def latestVersion = pmmVersion() +def versionsList = pmmVersion('dbaas') + +def parallelStagesMatrix = versionsList.collectEntries { + ["${it}" : generateStage(it)] +} + +def generateStage(VERSION) { + return { + stage("${VERSION}") { + runDbaaSUpgradeTests( + GIT_BRANCH, + DOCKER_VERSION, + CLIENT_VERSION, + PMM_SERVER_LATEST, + VERSION_SERVICE_VERSION, + PMM_REPOSITORY, + PMM_QA_GIT_BRANCH + ) + } + } +} + +pipeline { + agent { + label 'large-amazon' + } + parameters { + string( + defaultValue: 'main', + description: 'Tag/Branch for pmm-ui-tests repository', + name: 'GIT_BRANCH') + choice( + choices: versionsList, + description: 'PMM Server Version to test for Upgrade', + name: 'DOCKER_VERSION') + choice( + choices: versionsList, + description: 'PMM Client Version to test for Upgrade', + name: 'CLIENT_VERSION') + string( + defaultValue: 'main', + description: 'Tag/Branch for pmm-qa repository', + name: 'PMM_QA_GIT_BRANCH') + string( + defaultValue: latestVersion, + description: 'dev-latest PMM Server Version', + name: 'PMM_SERVER_LATEST') + choice( + choices: ['dev','prod'], + description: 'Prod or Dev version service', + name: 'VERSION_SERVICE_VERSION') + string( + defaultValue: 'main', + description: 'Tag/Branch for pmm-qa repository', + name: 'PMM_QA_GIT_BRANCH') + choice( + choices: ['Experimental', 'Testing'], + description: "Select Testing (RC Tesing) or Experimental (dev-latest testing) Repository", + name: 'PMM_REPOSITORY') + } + options { + skipDefaultCheckout() + disableConcurrentBuilds() + } + triggers { + cron('0 1 * * 7') + } + stages{ + stage('Upgrade DbaaS E2E Matrix'){ + steps{ + script { + parallel parallelStagesMatrix + } + } + } + } + post { + always { + script { + if (currentBuild.result == null || currentBuild.result == 'SUCCESS') { + slackSend channel: '#pmm-ci', color: '#00FF00', message: "[${JOB_NAME}]: build finished - ${BUILD_URL} " + } else { + slackSend channel: '#pmm-ci', color: '#FF0000', message: "[${JOB_NAME}]: build ${currentBuild.result} - ${BUILD_URL}" + } + } + deleteDir() + } + } +} From 709bb96b54e0d92ef09f6ccc506879f0f45b3a06 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Thu, 16 Jun 2022 13:13:59 +0530 Subject: [PATCH 06/14] PMM-9610 Address Review Comments --- pmm/pmm2-dbaas-upgrade-tests.groovy | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 105a299cbb..3e5be8fd6d 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -40,7 +40,7 @@ def versionsList = pmmVersion('list') pipeline { agent { - label 'docker' + label 'agent-amd64' } parameters { string( @@ -97,22 +97,14 @@ pipeline { // clean up workspace and fetch pmm-ui-tests repository deleteDir() git poll: false, branch: GIT_BRANCH, url: 'https://github.com/percona/pmm-ui-tests.git' - - installDocker() - setupDockerCompose() sh ''' docker-compose --version - sudo yum -y update --security - sudo yum -y install php php-mysqlnd php-pdo jq svn bats mysql - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl + sudo yum -y install mysql sudo amazon-linux-extras install epel -y sudo mkdir -p /srv/pmm-qa || : pushd /srv/pmm-qa sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git . sudo git checkout \${PMM_QA_GIT_COMMIT_HASH} - sudo chmod 755 pmm-tests/install-google-chrome.sh - bash ./pmm-tests/install-google-chrome.sh popd sudo ln -s /usr/bin/google-chrome-stable /usr/bin/chromium ''' @@ -151,9 +143,7 @@ pipeline { } stage('Setup Node') { steps { - setupNodejs() sh """ - sudo yum install -y gettext envsubst < env.list > env.generated.list """ } From 010c59383758cff469e80f1370838b69c55ac165 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Thu, 16 Jun 2022 13:52:54 +0530 Subject: [PATCH 07/14] PMM-9610 Add npm ci --- pmm/pmm2-dbaas-upgrade-tests.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 3e5be8fd6d..d7ded9534c 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -145,6 +145,7 @@ pipeline { steps { sh """ envsubst < env.list > env.generated.list + npm ci """ } } From 6d3010705ae8059996187bcca16dfc968bd40917 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Thu, 16 Jun 2022 17:35:37 +0530 Subject: [PATCH 08/14] PMM-9610 use npm install --- pmm/pmm2-dbaas-upgrade-tests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index d7ded9534c..7a8b9fe746 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -145,7 +145,7 @@ pipeline { steps { sh """ envsubst < env.list > env.generated.list - npm ci + npm install """ } } From 2fd832c1573d8bd4fdefaad806d03023de962848 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Thu, 16 Jun 2022 18:21:55 +0530 Subject: [PATCH 09/14] PMM-9610 fix the browser isue --- pmm/pmm2-dbaas-upgrade-tests.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 7a8b9fe746..7a9b35bf9c 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -106,7 +106,6 @@ pipeline { sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git . sudo git checkout \${PMM_QA_GIT_COMMIT_HASH} popd - sudo ln -s /usr/bin/google-chrome-stable /usr/bin/chromium ''' } } @@ -145,7 +144,7 @@ pipeline { steps { sh """ envsubst < env.list > env.generated.list - npm install + npm ci """ } } From db78b1e55d0b87fe6dbea5ab6113ebb7cf1f032c Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Thu, 16 Jun 2022 19:33:49 +0530 Subject: [PATCH 10/14] PMM-9610 path for chromium --- pmm/pmm2-dbaas-upgrade-tests.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 7a9b35bf9c..15ceb35840 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -106,6 +106,7 @@ pipeline { sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git . sudo git checkout \${PMM_QA_GIT_COMMIT_HASH} popd + sudo ln -s /usr/bin/chromium-browser /usr/bin/chromium ''' } } From 36289f329b49abb2abcdeda11f3e541e4057665b Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Fri, 17 Jun 2022 10:43:39 +0530 Subject: [PATCH 11/14] PMM-9610 Address Comments --- pmm/pmm2-dbaas-upgrade-tests-matrix.groovy | 2 +- pmm/pmm2-dbaas-upgrade-tests.groovy | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy index 281f5b4484..3b909fa2d9 100644 --- a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy @@ -39,7 +39,7 @@ def generateStage(VERSION) { pipeline { agent { - label 'large-amazon' + label 'cli' } parameters { string( diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index 15ceb35840..b0e32dfcdf 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -100,7 +100,6 @@ pipeline { sh ''' docker-compose --version sudo yum -y install mysql - sudo amazon-linux-extras install epel -y sudo mkdir -p /srv/pmm-qa || : pushd /srv/pmm-qa sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git . From 334ea746435497a35ba4f3ccb9d308086058738b Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Fri, 17 Jun 2022 10:48:01 +0530 Subject: [PATCH 12/14] PMM-9610 bug in the upgrade matrix job --- pmm/pmm2-dbaas-upgrade-tests-matrix.groovy | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy index 3b909fa2d9..6969a88456 100644 --- a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy @@ -26,8 +26,8 @@ def generateStage(VERSION) { stage("${VERSION}") { runDbaaSUpgradeTests( GIT_BRANCH, - DOCKER_VERSION, - CLIENT_VERSION, + VERSION, + VERSION, PMM_SERVER_LATEST, VERSION_SERVICE_VERSION, PMM_REPOSITORY, @@ -46,14 +46,6 @@ pipeline { defaultValue: 'main', description: 'Tag/Branch for pmm-ui-tests repository', name: 'GIT_BRANCH') - choice( - choices: versionsList, - description: 'PMM Server Version to test for Upgrade', - name: 'DOCKER_VERSION') - choice( - choices: versionsList, - description: 'PMM Client Version to test for Upgrade', - name: 'CLIENT_VERSION') string( defaultValue: 'main', description: 'Tag/Branch for pmm-qa repository', From 66af1a4b4dafa53984eca2e5e2dbcb9509fa03a9 Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Fri, 17 Jun 2022 10:49:34 +0530 Subject: [PATCH 13/14] PMM-9610 test commit --- pmm/pmm2-dbaas-upgrade-tests-matrix.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy index 6969a88456..f5c60ca1dd 100644 --- a/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests-matrix.groovy @@ -1,4 +1,4 @@ -library changelog: false, identifier: 'lib@master', retriever: modernSCM([ +library changelog: false, identifier: 'lib@PMM-9610', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' ]) _ From 7ff00e5f4e1c06cace148463bff89ec28859da2e Mon Sep 17 00:00:00 2001 From: puneet0191 Date: Fri, 17 Jun 2022 13:37:56 +0530 Subject: [PATCH 14/14] PMM-9610 temp fix --- pmm/pmm2-dbaas-upgrade-tests.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/pmm/pmm2-dbaas-upgrade-tests.groovy b/pmm/pmm2-dbaas-upgrade-tests.groovy index b0e32dfcdf..15ceb35840 100644 --- a/pmm/pmm2-dbaas-upgrade-tests.groovy +++ b/pmm/pmm2-dbaas-upgrade-tests.groovy @@ -100,6 +100,7 @@ pipeline { sh ''' docker-compose --version sudo yum -y install mysql + sudo amazon-linux-extras install epel -y sudo mkdir -p /srv/pmm-qa || : pushd /srv/pmm-qa sudo git clone --single-branch --branch \${PMM_QA_GIT_BRANCH} https://github.com/percona/pmm-qa.git .