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 upgrade to release #2423

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

PMM-7 fix upgrade to release #2423

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
7a9af2a
PMM-7 fix upgrade to release
yurkovychv Dec 13, 2023
5e54391
Update pmm2-upgrade-tests.groovy
yurkovychv Dec 13, 2023
844aff6
Update setupPMMClient.groovy
yurkovychv Dec 14, 2023
9a4e502
Update pmm2-upgrade-tests.groovy
yurkovychv Dec 14, 2023
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
4 changes: 2 additions & 2 deletions pmm/pmm2-upgrade-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-upgrade-to-release', retriever: modernSCM([
$class: 'GitSCMSource',
remote: 'https://github.com/Percona-Lab/jenkins-pipelines.git'
]) _
Expand Down Expand Up @@ -264,7 +264,7 @@ pipeline {
docker exec pmm-server yum clean all
docker exec pmm-server yum clean metadata
"""
setupPMMClient(env.SERVER_IP, CLIENT_VERSION, 'pmm2', 'no', 'release', 'yes', 'compose_setup', params.ADMIN_PASSWORD)
setupPMMClient(env.SERVER_IP, CLIENT_VERSION, 'pmm2', 'no', 'release', 'yes', 'compose_setup', params.ADMIN_PASSWORD, 'no')
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions vars/setupPMMClient.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENABLE_PULL_MODE, String ENABLE_TESTING_REPO, String CLIENT_INSTANCE, String SETUP_TYPE, String ADMIN_PASSWORD) {
def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENABLE_PULL_MODE, String ENABLE_TESTING_REPO, String CLIENT_INSTANCE, String SETUP_TYPE, String ADMIN_PASSWORD, String ENABLE_EXPERIMENTAL_REPO) {
withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AMI/OVF', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
sh '''
set -o errexit
Expand All @@ -11,6 +11,7 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
export PMM_VERSION=${PMM_VERSION}
export ENABLE_PULL_MODE=${ENABLE_PULL_MODE}
export ENABLE_TESTING_REPO=${ENABLE_TESTING_REPO}
export ENABLE_EXPERIMENTAL_REPO=${ENABLE_EXPERIMENTAL_REPO}
export CLIENT_INSTANCE=${CLIENT_INSTANCE}
export SETUP_TYPE=${SETUP_TYPE}
export ADMIN_PASSWORD=${ADMIN_PASSWORD}
Expand Down Expand Up @@ -45,7 +46,7 @@ def call(String SERVER_IP, String CLIENT_VERSION, String PMM_VERSION, String ENA
sudo percona-release enable-only original testing
elif [[ "$ENABLE_TESTING_REPO" = no ]]; then
sudo percona-release enable-only original experimental
else
elif [[ "$ENABLE_TESTING_REPO" = no && "$ENABLE_EXPERIMENTAL_REPO" = no ]]; then
sudo percona-release enable-only original release
fi
sleep 10
Expand Down