Skip to content

Commit 17d8078

Browse files
vorselvorsel
committed
PKG-1158 psmdb70: pro-non-pro build changes
1 parent d8f2e1f commit 17d8078

File tree

2 files changed

+41
-142
lines changed

2 files changed

+41
-142
lines changed

‎psmdb/jenkins/percona-server-for-mongodb-7.0.groovy‎

Lines changed: 39 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,21 @@ library changelog: false, identifier: 'lib@hetzner', retriever: modernSCM([
44
]) _
55

66
void buildStage(String DOCKER_OS, String STAGE_PARAM) {
7-
withCredentials([string(credentialsId: 'GITHUB_API_TOKEN', variable: 'TOKEN')]) {
8-
sh """
7+
sh """
8+
set -o xtrace
9+
ls -laR ./
10+
rm -rf test/*
11+
mkdir -p test
12+
wget \$(echo ${GIT_REPO} | sed -re 's|github.com|raw.githubusercontent.com|; s|\\.git\$||')/${GIT_BRANCH}/percona-packaging/scripts/psmdb_builder.sh -O psmdb_builder.sh
13+
pwd -P
14+
ls -laR
15+
export build_dir=\$(pwd -P)
16+
docker run -u root -v \${build_dir}:\${build_dir} ${DOCKER_OS} sh -c "
917
set -o xtrace
10-
ls -laR ./
11-
rm -rf test/*
12-
mkdir -p test
13-
if [ \${FULL_FEATURED} = "yes" ]; then
14-
PRO_BRANCH="v7.0"
15-
curl -H "Authorization: token ${TOKEN}" https://api.github.com/user
16-
curl -L -H "Authorization: Bearer \${TOKEN}" \
17-
-H "Accept: application/vnd.github.v3.raw" \
18-
-o psmdb_builder.sh \
19-
"https://api.github.com/repos/percona/mongo-build-scripts/contents/scripts/psmdb_builder.sh?ref=\${PRO_BRANCH}"
20-
else
21-
wget \$(echo ${GIT_REPO} | sed -re 's|github.com|raw.githubusercontent.com|; s|\\.git\$||')/${GIT_BRANCH}/percona-packaging/scripts/psmdb_builder.sh -O psmdb_builder.sh
22-
fi
23-
pwd -P
24-
ls -laR
25-
export build_dir=\$(pwd -P)
26-
docker run -u root -v \${build_dir}:\${build_dir} ${DOCKER_OS} sh -c "
27-
set -o xtrace
28-
cd \${build_dir}
29-
bash -x ./psmdb_builder.sh --builddir=\${build_dir}/test --install_deps=1
30-
if [ \${FULL_FEATURED} = "yes" ]; then
31-
git clone --depth 1 --branch \${PRO_BRANCH} https://x-access-token:${TOKEN}@github.com/percona/mongo-build-scripts.git percona-packaging
32-
mv -f \${build_dir}/percona-packaging \${build_dir}/test/.
33-
ls -la \${build_dir}/percona-packaging
34-
fi
35-
bash -x ./psmdb_builder.sh --builddir=\${build_dir}/test --repo=${GIT_REPO} --branch=${GIT_BRANCH} --psm_ver=${PSMDB_VERSION} --psm_release=${PSMDB_RELEASE} --mongo_tools_tag=${MONGO_TOOLS_TAG} ${STAGE_PARAM}"
36-
"""
37-
}
18+
cd \${build_dir}
19+
bash -x ./psmdb_builder.sh --builddir=\${build_dir}/test --install_deps=1
20+
bash -x ./psmdb_builder.sh --builddir=\${build_dir}/test --repo=${GIT_REPO} --branch=${GIT_BRANCH} --psm_ver=${PSMDB_VERSION} --psm_release=${PSMDB_RELEASE} --mongo_tools_tag=${MONGO_TOOLS_TAG} ${STAGE_PARAM}"
21+
"""
3822
}
3923

4024
void cleanUpWS() {
@@ -129,11 +113,7 @@ pipeline {
129113
slackNotify("#releases-ci", "#00FF00", "[${JOB_NAME}]: starting build for ${GIT_BRANCH} - [${BUILD_URL}]")
130114
cleanUpWS()
131115
script {
132-
if (env.FULL_FEATURED == 'yes') {
133-
buildStage("oraclelinux:8", "--get_sources=1 --full_featured=1")
134-
} else {
135-
buildStage("oraclelinux:8", "--get_sources=1")
136-
}
116+
buildStage("oraclelinux:8", "--get_sources=1")
137117
}
138118
sh '''
139119
REPO_UPLOAD_PATH=$(grep "UPLOAD" test/percona-server-mongodb-70.properties | cut -d = -f 2 | sed "s:$:${BUILD_NUMBER}:")
@@ -165,11 +145,7 @@ pipeline {
165145
cleanUpWS()
166146
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
167147
script {
168-
if (env.FULL_FEATURED == 'yes') {
169-
buildStage("oraclelinux:8", "--build_src_rpm=1 --full_featured=1")
170-
} else {
171-
buildStage("oraclelinux:8", "--build_src_rpm=1")
172-
}
148+
buildStage("oraclelinux:8", "--build_src_rpm=1")
173149
}
174150

175151
pushArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
@@ -184,11 +160,7 @@ pipeline {
184160
cleanUpWS()
185161
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
186162
script {
187-
if (env.FULL_FEATURED == 'yes') {
188-
buildStage("ubuntu:jammy", "--build_src_deb=1 --full_featured=1")
189-
} else {
190-
buildStage("ubuntu:jammy", "--build_src_deb=1")
191-
}
163+
buildStage("ubuntu:jammy", "--build_src_deb=1")
192164
}
193165
pushArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
194166
uploadDEBfromAWS(params.CLOUD, "source_deb/", AWS_STASH_PATH)
@@ -209,11 +181,7 @@ pipeline {
209181
cleanUpWS()
210182
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
211183
script {
212-
if (env.FULL_FEATURED == 'yes') {
213-
buildStage("oraclelinux:8", "--build_rpm=1 --full_featured=1")
214-
} else {
215-
buildStage("oraclelinux:8", "--build_rpm=1")
216-
}
184+
buildStage("oraclelinux:8", "--build_rpm=1")
217185
}
218186
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
219187
}
@@ -226,11 +194,7 @@ pipeline {
226194
cleanUpWS()
227195
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
228196
script {
229-
if (env.FULL_FEATURED == 'yes') {
230-
buildStage("oraclelinux:8", "--build_rpm=1 --full_featured=1")
231-
} else {
232-
buildStage("oraclelinux:8", "--build_rpm=1")
233-
}
197+
buildStage("oraclelinux:8", "--build_rpm=1")
234198
}
235199
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
236200
}
@@ -243,11 +207,7 @@ pipeline {
243207
cleanUpWS()
244208
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
245209
script {
246-
if (env.FULL_FEATURED == 'yes') {
247-
buildStage("oraclelinux:9", "--build_rpm=1 --full_featured=1")
248-
} else {
249-
buildStage("oraclelinux:9", "--build_rpm=1")
250-
}
210+
buildStage("oraclelinux:9", "--build_rpm=1")
251211
}
252212
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
253213
}
@@ -260,11 +220,7 @@ pipeline {
260220
cleanUpWS()
261221
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
262222
script {
263-
if (env.FULL_FEATURED == 'yes') {
264-
buildStage("oraclelinux:9", "--build_rpm=1 --full_featured=1")
265-
} else {
266-
buildStage("oraclelinux:9", "--build_rpm=1")
267-
}
223+
buildStage("oraclelinux:9", "--build_rpm=1")
268224
}
269225
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
270226
}
@@ -277,11 +233,7 @@ pipeline {
277233
cleanUpWS()
278234
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
279235
script {
280-
if (env.FULL_FEATURED == 'yes') {
281-
buildStage("amazonlinux:2023", "--build_rpm=1 --full_featured=1")
282-
} else {
283-
buildStage("amazonlinux:2023", "--build_rpm=1")
284-
}
236+
buildStage("amazonlinux:2023", "--build_rpm=1")
285237
}
286238
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
287239
}
@@ -294,11 +246,7 @@ pipeline {
294246
cleanUpWS()
295247
popArtifactFolder(params.CLOUD, "srpm/", AWS_STASH_PATH)
296248
script {
297-
if (env.FULL_FEATURED == 'yes') {
298-
buildStage("amazonlinux:2023", "--build_rpm=1 --full_featured=1")
299-
} else {
300-
buildStage("amazonlinux:2023", "--build_rpm=1")
301-
}
249+
buildStage("amazonlinux:2023", "--build_rpm=1")
302250
}
303251
pushArtifactFolder(params.CLOUD, "rpm/", AWS_STASH_PATH)
304252
}
@@ -311,11 +259,7 @@ pipeline {
311259
cleanUpWS()
312260
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
313261
script {
314-
if (env.FULL_FEATURED == 'yes') {
315-
buildStage("ubuntu:jammy", "--build_deb=1 --full_featured=1")
316-
} else {
317-
buildStage("ubuntu:jammy", "--build_deb=1")
318-
}
262+
buildStage("ubuntu:jammy", "--build_deb=1")
319263
}
320264
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
321265
}
@@ -328,11 +272,7 @@ pipeline {
328272
cleanUpWS()
329273
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
330274
script {
331-
if (env.FULL_FEATURED == 'yes') {
332-
buildStage("ubuntu:jammy", "--build_deb=1 --full_featured=1")
333-
} else {
334-
buildStage("ubuntu:jammy", "--build_deb=1")
335-
}
275+
buildStage("ubuntu:jammy", "--build_deb=1")
336276
}
337277
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
338278
}
@@ -345,11 +285,7 @@ pipeline {
345285
cleanUpWS()
346286
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
347287
script {
348-
if (env.FULL_FEATURED == 'yes') {
349-
buildStage("ubuntu:noble", "--build_deb=1 --full_featured=1")
350-
} else {
351-
buildStage("ubuntu:noble", "--build_deb=1")
352-
}
288+
buildStage("ubuntu:noble", "--build_deb=1")
353289
}
354290
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
355291
}
@@ -362,11 +298,7 @@ pipeline {
362298
cleanUpWS()
363299
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
364300
script {
365-
if (env.FULL_FEATURED == 'yes') {
366-
buildStage("ubuntu:noble", "--build_deb=1 --full_featured=1")
367-
} else {
368-
buildStage("ubuntu:noble", "--build_deb=1")
369-
}
301+
buildStage("ubuntu:noble", "--build_deb=1")
370302
}
371303
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
372304
}
@@ -379,11 +311,7 @@ pipeline {
379311
cleanUpWS()
380312
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
381313
script {
382-
if (env.FULL_FEATURED == 'yes') {
383-
buildStage("debian:bullseye", "--build_deb=1 --full_featured=1")
384-
} else {
385-
buildStage("debian:bullseye", "--build_deb=1")
386-
}
314+
buildStage("debian:bullseye", "--build_deb=1")
387315
}
388316
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
389317
}
@@ -396,11 +324,7 @@ pipeline {
396324
cleanUpWS()
397325
popArtifactFolder(params.CLOUD, "source_deb/", AWS_STASH_PATH)
398326
script {
399-
if (env.FULL_FEATURED == 'yes') {
400-
buildStage("debian:bookworm", "--build_deb=1 --full_featured=1")
401-
} else {
402-
buildStage("debian:bookworm", "--build_deb=1")
403-
}
327+
buildStage("debian:bookworm", "--build_deb=1")
404328
}
405329
pushArtifactFolder(params.CLOUD, "deb/", AWS_STASH_PATH)
406330
}
@@ -413,11 +337,7 @@ pipeline {
413337
cleanUpWS()
414338
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
415339
script {
416-
if (env.FULL_FEATURED == 'yes') {
417-
buildStage("oraclelinux:8", "--build_tarball=1 --full_featured=1")
418-
} else {
419-
buildStage("oraclelinux:8", "--build_tarball=1")
420-
}
340+
buildStage("oraclelinux:8", "--build_tarball=1")
421341
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
422342
}
423343
}
@@ -430,11 +350,7 @@ pipeline {
430350
cleanUpWS()
431351
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
432352
script {
433-
if (env.FULL_FEATURED == 'yes') {
434-
buildStage("oraclelinux:9", "--build_tarball=1 --full_featured=1")
435-
} else {
436-
buildStage("oraclelinux:9", "--build_tarball=1")
437-
}
353+
buildStage("oraclelinux:9", "--build_tarball=1")
438354
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
439355
}
440356
}
@@ -447,11 +363,7 @@ pipeline {
447363
cleanUpWS()
448364
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
449365
script {
450-
if (env.FULL_FEATURED == 'yes') {
451-
buildStage("amazonlinux:2023", "--build_tarball=1 --full_featured=1")
452-
} else {
453-
buildStage("amazonlinux:2023", "--build_tarball=1")
454-
}
366+
buildStage("amazonlinux:2023", "--build_tarball=1")
455367
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
456368
}
457369
}
@@ -464,11 +376,7 @@ pipeline {
464376
cleanUpWS()
465377
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
466378
script {
467-
if (env.FULL_FEATURED == 'yes') {
468-
buildStage("ubuntu:jammy", "--build_tarball=1 --full_featured=1")
469-
} else {
470-
buildStage("ubuntu:jammy", "--build_tarball=1")
471-
}
379+
buildStage("ubuntu:jammy", "--build_tarball=1")
472380
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
473381
}
474382
}
@@ -481,27 +389,22 @@ pipeline {
481389
cleanUpWS()
482390
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
483391
script {
484-
if (env.FULL_FEATURED == 'yes') {
485-
buildStage("ubuntu:noble", "--build_tarball=1 --full_featured=1")
486-
} else {
487-
buildStage("ubuntu:noble", "--build_tarball=1")
488-
}
392+
buildStage("ubuntu:noble", "--build_tarball=1")
489393
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
490394
}
491395
}
492396
}
493397
stage('Debian Bullseye(11) binary tarball(glibc2.31)') {
494-
when {
495-
expression { env.FULL_FEATURED != 'yes' }
496-
}
497398
agent {
498399
label params.CLOUD == 'Hetzner' ? 'docker-x64' : 'docker-64gb'
499400
}
500401
steps {
501402
cleanUpWS()
502403
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
503-
buildStage("debian:bullseye", "--build_tarball=1")
504-
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
404+
script {
405+
buildStage("debian:bullseye", "--build_tarball=1")
406+
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
407+
}
505408
}
506409
}
507410
stage('Debian Bookworm(12) binary tarball(glibc2.36)') {
@@ -512,11 +415,7 @@ pipeline {
512415
cleanUpWS()
513416
popArtifactFolder(params.CLOUD, "source_tarball/", AWS_STASH_PATH)
514417
script {
515-
if (env.FULL_FEATURED == 'yes') {
516-
buildStage("debian:bookworm", "--build_tarball=1 --full_featured=1")
517-
} else {
518-
buildStage("debian:bookworm", "--build_tarball=1")
519-
}
418+
buildStage("debian:bookworm", "--build_tarball=1")
520419
pushArtifactFolder(params.CLOUD, "tarball/", AWS_STASH_PATH)
521420
}
522421
}

‎psmdb/jenkins/percona-server-for-mongodb-7.0.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
- job:
2-
name: hetzner-psmdb70-autobuild-RELEASE
2+
name: pro-non-pro-hetzner-psmdb70-autobuild-RELEASE
33
project-type: pipeline
44
description: |
55
Do not edit this job through the web!
66
pipeline-scm:
77
scm:
88
- git:
9-
url: https://github.com/Percona-Lab/jenkins-pipelines.git
9+
url: https://github.com/vorsel/jenkins-pipelines.git
1010
branches:
1111
- 'hetzner'
1212
wipe-workspace: false

0 commit comments

Comments
 (0)