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-13233 use pmm3-client repo instead of original #2732

Merged
merged 4 commits into from
Jul 18, 2024
Merged

PMM-13233 use pmm3-client repo instead of original #2732

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
795b73a
PMM-13233 use pmm3-client repo instead of original
yurkovychv Jul 11, 2024
6efdd92
Update pmm3-release.groovy
yurkovychv Jul 11, 2024
7fe345e
Merge branch 'master' into PMM-13233-use-pmm3-client-repo
yurkovychv Jul 12, 2024
5731bcd
Merge branch 'master' into PMM-13233-use-pmm3-client-repo
yurkovychv Jul 16, 2024
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
25 changes: 20 additions & 5 deletions pmm/v3/pmm3-release.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,26 @@ ENDSSH
}
}
}
stage('Run post-release tests') {
steps {
build job: 'pmm3-release-tests', propagate: false, wait: false, parameters: [
string(name: 'VERSION', value: params.VERSION)
]
stage('Run post-release tests GH Actions') {
steps{
script{
withCredentials([string(credentialsId: 'GITHUB_API_TOKEN', variable: 'GITHUB_API_TOKEN')]) {
sh '''
curl -v -X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token ${GITHUB_API_TOKEN}" \
"https://api.github.com/repos/percona/pmm-qa/actions/workflows/package-test-single.yml/dispatches" \
-d '{"ref":"v3","inputs":{"playbook": "pmm3-client", "package": "pmm3-client", "repository": "release", "metrics_mode": "auto"}}'
'''
sh '''
curl -v -X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token ${GITHUB_API_TOKEN}" \
"https://api.github.com/repos/percona/pmm-qa/actions/workflows/e2e-upgrade-tests-matrix-full.yml/dispatches" \
-d '{"ref":"v3","inputs":{"pmm_ui_tests_branch": "v3", "pmm_qa_branch": "v3", "repository": "release", "versions_range": 1}}'
'''
}
}
}
}
stage('Scan Image for Vulnerabilities') {
Expand Down
12 changes: 6 additions & 6 deletions pmm/v3/vars/setupPMM3Client.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
fi

if [ "${CLIENT_VERSION}" = 3-dev-latest ]; then
sudo percona-release enable-only original experimental
sudo percona-release enable-only pmm3-client experimental
RHEL=$(rpm --eval '%{rhel}')
if [ "$RHEL" -eq 9 ]; then
sudo yum -y install https://repo.percona.com/pmm3-client/yum/experimental/9/RPMS/x86_64/pmm-client-3.0.0-6.el9.x86_64.rpm
Expand All @@ -37,19 +37,19 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
exit 1
fi
elif [ "${CLIENT_VERSION}" = pmm3-rc ]; then
sudo percona-release enable-only original testing
sudo percona-release enable-only pmm3-client testing
sudo yum -y install pmm-client
elif [ "${CLIENT_VERSION}" = pmm3-latest ]; then
sudo percona-release enable-only original experimental
sudo percona-release enable-only pmm3-client experimental
sudo yum -y install pmm-client
sudo yum -y update
elif [[ "${CLIENT_VERSION}" = 3* ]]; then
if [ "${ENABLE_TESTING_REPO}" = yes ]; then
sudo percona-release enable-only original testing
sudo percona-release enable-only pmm3-client testing
elif [ "${ENABLE_EXPERIMENTAL_REPO}" = yes ]; then
sudo percona-release enable-only original experimental
sudo percona-release enable-only pmm3-client experimental
else
sudo percona-release enable-only original release
sudo percona-release enable-only pmm3-client release
fi
sudo yum -y install "pmm-client-${CLIENT_VERSION}-1.el9.x86_64"
sleep 10
Expand Down