Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-7 Fix permission on the client tarball #1742

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

PMM-7 Fix permission on the client tarball #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30d3f4c
PMM-7 Fix the permission for tar ball setup
puneet0191 Sep 6, 2022
59ad37a
PMM-7 Update Library
puneet0191 Sep 6, 2022
6008ccb
PMM-7 Update Library
puneet0191 Sep 6, 2022
d96e223
PMM-7 Update the library
puneet0191 Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pmm/aws-staging-start.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]) _
Expand Down
2 changes: 1 addition & 1 deletion pmm/pmm2-testsuite.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]) _
Expand Down
2 changes: 1 addition & 1 deletion pmm/pmm2-ui-tests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
]) _
Expand Down
12 changes: 6 additions & 6 deletions vars/setupPMMClient.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down