From 30d3f4c03d4544348d40c13ef90ca7647601dc65 Mon Sep 17 00:00:00 2001 From: Puneet Kala Date: Tue, 6 Sep 2022 20:08:30 +0530 Subject: [PATCH 1/4] PMM-7 Fix the permission for tar ball setup --- vars/setupPMMClient.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vars/setupPMMClient.groovy b/vars/setupPMMClient.groovy index 28ae0594fa..0c2e0bf433 100644 --- a/vars/setupPMMClient.groovy +++ b/vars/setupPMMClient.groovy @@ -77,21 +77,21 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA pwd cd ../ export PMM_CLIENT_BASEDIR=`ls -1td pmm2-client 2>/dev/null | grep -v ".tar" | head -n1` - export PATH="`pwd`/pmm2-client/bin:\$PATH" - echo "export PATH=`pwd`/pmm2-client/bin:\$PATH" >> ~/.bash_profile + export PATH="/usr/local/percona/pmm2/bin:\$PATH" + echo "export PATH=/usr/local/percona/pmm2/bin:\$PATH" >> ~/.bash_profile source ~/.bash_profile pmm-admin --version if [[ \$CLIENT_INSTANCE == yes ]]; then if [[ \$ENABLE_PULL_MODE == yes ]]; then - pmm-agent setup --config-file=`pwd`/pmm2-client/config/pmm-agent.yaml --server-address=\$SERVER_IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD --metrics-mode=pull \$IP + sudo pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=\$SERVER_IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD --metrics-mode=pull \$IP else - pmm-agent setup --config-file=`pwd`/pmm2-client/config/pmm-agent.yaml --server-address=\$SERVER_IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD \$IP + sudo pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=\$SERVER_IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD \$IP fi else - pmm-agent setup --config-file=`pwd`/pmm2-client/config/pmm-agent.yaml --server-address=\$IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD \$IP + sudo pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=\$IP:443 --server-insecure-tls --server-username=admin --server-password=\$ADMIN_PASSWORD \$IP fi sleep 10 - JENKINS_NODE_COOKIE=dontKillMe nohup bash -c 'pmm-agent --config-file=`pwd`/pmm2-client/config/pmm-agent.yaml > pmm-agent.log 2>&1 &' + JENKINS_NODE_COOKIE=dontKillMe nohup bash -c 'sudo pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml > pmm-agent.log 2>&1 &' sleep 10 cat pmm-agent.log pmm-admin status From 59ad37ab266e5137892ebe3c8c12f47076a091a1 Mon Sep 17 00:00:00 2001 From: Puneet Kala Date: Tue, 6 Sep 2022 20:10:40 +0530 Subject: [PATCH 2/4] PMM-7 Update Library --- pmm/aws-staging-start.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm/aws-staging-start.groovy b/pmm/aws-staging-start.groovy index 1af8c84b7a..67cf8368d0 100644 --- a/pmm/aws-staging-start.groovy +++ b/pmm/aws-staging-start.groovy @@ -3,7 +3,7 @@ import hudson.slaves.* import jenkins.model.Jenkins import hudson.plugins.sshslaves.SSHLauncher -library changelog: false, identifier: 'lib@master', retriever: modernSCM([ +library changelog: false, identifier: 'lib@PMM-7-Fix_CLIENT_TAR_BALL', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' ]) _ From 6008ccbceecd4fa3ba4623388073d8065d7ea418 Mon Sep 17 00:00:00 2001 From: Puneet Kala Date: Tue, 6 Sep 2022 20:10:59 +0530 Subject: [PATCH 3/4] PMM-7 Update Library --- pmm/pmm2-ui-tests.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm/pmm2-ui-tests.groovy b/pmm/pmm2-ui-tests.groovy index 061d6a62a4..bd04c033fa 100644 --- a/pmm/pmm2-ui-tests.groovy +++ b/pmm/pmm2-ui-tests.groovy @@ -1,4 +1,4 @@ -library changelog: false, identifier: 'lib@master', retriever: modernSCM([ +library changelog: false, identifier: 'lib@PMM-7-Fix_CLIENT_TAR_BALL', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' ]) _ From d96e223f54d0344ce7376de6d7a659d21365bbef Mon Sep 17 00:00:00 2001 From: Puneet Kala Date: Tue, 6 Sep 2022 20:11:17 +0530 Subject: [PATCH 4/4] PMM-7 Update the library --- pmm/pmm2-testsuite.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmm/pmm2-testsuite.groovy b/pmm/pmm2-testsuite.groovy index 375a3a810d..5fa14afaa4 100644 --- a/pmm/pmm2-testsuite.groovy +++ b/pmm/pmm2-testsuite.groovy @@ -3,7 +3,7 @@ import hudson.slaves.* import jenkins.model.Jenkins import hudson.plugins.sshslaves.SSHLauncher -library changelog: false, identifier: 'lib@master', retriever: modernSCM([ +library changelog: false, identifier: 'lib@PMM-7-Fix_CLIENT_TAR_BALL', retriever: modernSCM([ $class: 'GitSCMSource', remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git' ]) _