Skip to content

Commit 28d398e

Browse files
authored
RM-1741 pdps-8.0.44 release (#3692)
1 parent 5fa4f66 commit 28d398e

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

ps-pxc-dist/Jenkinsfile.groovy

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,17 @@ pipeline {
107107
)
108108
choice(
109109
choices: 'YES\nNO',
110-
description: 'Push amazonelinux 2023 packages by default',
110+
description: 'Push amazonlinux 2023 packages',
111111
name: 'PUSHAMAZONLINUX'
112112
)
113+
choice(
114+
choices: 'YES\nNO',
115+
description: 'Push trixie packages',
116+
name: 'PUSHTRIXIE'
117+
)
113118
choice(
114119
choices: 'NO\nYES',
115-
description: 'Don't push focal packages by default',
120+
description: 'Push focal packages',
116121
name: 'PUSHFOCAL'
117122
)
118123
}
@@ -141,6 +146,7 @@ pipeline {
141146
echo "REMOVE_BEFORE_PUSH=\${REMOVE_BEFORE_PUSH}" >> args_pipeline
142147
echo "PUSHAMAZONLINUX=\${PUSHAMAZONLINUX}" >> args_pipeline
143148
echo "PUSHFOCAL=\${PUSHFOCAL}" >> args_pipeline
149+
echo "PUSHTRIXIE=\${PUSHTRIXIE}" >> args_pipeline
144150
echo "\$(awk '{\$1="export" OFS \$1} 1' args_pipeline)" > args_pipeline
145151
rsync -aHv --delete -e "ssh -o StrictHostKeyChecking=no -i \$KEY_PATH" args_pipeline \$USER@repo.ci.percona.com:/tmp/args_pipeline
146152
ssh -o StrictHostKeyChecking=no -i \$KEY_PATH \$USER@repo.ci.percona.com " \
@@ -173,6 +179,8 @@ pipeline {
173179
echo "COMPONENT=\${COMPONENT}" >> args_pipeline
174180
echo "REMOVE_LOCKFILE=\${REMOVE_LOCKFILE}" >> args_pipeline
175181
echo "REMOVE_BEFORE_PUSH=\${REMOVE_BEFORE_PUSH}" >> args_pipeline
182+
echo "PUSHFOCAL=\${PUSHFOCAL}" >> args_pipeline
183+
echo "PUSHTRIXIE=\${PUSHTRIXIE}" >> args_pipeline
176184
echo "\$(awk '{\$1="export" OFS \$1} 1' args_pipeline)" > args_pipeline
177185
rsync -aHv --delete -e "ssh -o StrictHostKeyChecking=no -i \$KEY_PATH" args_pipeline \$USER@repo.ci.percona.com:/tmp/args_pipeline
178186
ssh -o StrictHostKeyChecking=no -i \$KEY_PATH \$USER@repo.ci.percona.com " \

ps-pxc-dist/apt_release.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,14 @@ for REPOPATH in $REPOPATH_TMP; do
4545
echo "<*> reprepro binary is $(which reprepro)"
4646
pushd /srv/UPLOAD/$dir/binary/debian
4747
echo "Looking for Debian build directories..."
48-
if [[ "${PUSHFOCAL}" == "YES" ]]; then
48+
if [[ "${PUSHFOCAL}" == "YES" ]] && [[ "${PUSHTRIXIE}" == "YES" ]]; then
4949
CODENAMES=$(ls -1)
50-
else
50+
elif [[ "${PUSHFOCAL}" == "YES" ]]; then
51+
CODENAMES=$(ls -1 | grep -v trixie)
52+
elif [[ "${PUSHTRIXIE}" == "YES" ]]; then
5153
CODENAMES=$(ls -1 | grep -v focal)
54+
else
55+
CODENAMES=$(ls -1 | grep -v focal | grep -v trixie)
5256
fi
5357
echo Distributions are: "${CODENAMES}"
5458
popd

rel/jenkins/percona-create-repos.groovy

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ pipeline {
3232
choices: 'NO\nYES',
3333
description: 'PRO build repo',
3434
name: 'PROBUILD')
35+
choice(
36+
choices: 'YES\nNO',
37+
description: 'Create YUM repo',
38+
name: 'CREATEYUM')
39+
choice(
40+
choices: 'YES\nNO',
41+
description: 'Create APT repo',
42+
name: 'CREATEAPT')
3543
}
3644
options {
3745
skipDefaultCheckout()
@@ -41,11 +49,17 @@ pipeline {
4149
}
4250
stages {
4351
stage('Create YUM repo') {
52+
when {
53+
expression { env.CREATEYUM == 'YES' }
54+
}
4455
steps {
4556
createRepo(REPO_NAME, 'yum', COMPONENTS, CENTOS_VERSIONS, DEB_CODE_NAMES, LIMIT, PROBUILD)
4657
}
4758
}
4859
stage('Create APT repo') {
60+
when {
61+
expression { env.CREATEAPT == 'YES' }
62+
}
4963
steps {
5064
createRepo(REPO_NAME, 'apt', COMPONENTS, CENTOS_VERSIONS, DEB_CODE_NAMES, LIMIT, PROBUILD)
5165
}

0 commit comments

Comments
 (0)