Skip to content

Commit 82d15d7

Browse files
vorselvorsel
committed
PKG-333 psmdb.cd: adjust var functs to run on Hetzner
1 parent 9293164 commit 82d15d7

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎pbm/jenkins/percona-mongodb-backup.groovy‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pipeline {
9393
}
9494
stash includes: 'uploadPath', name: 'uploadPath'
9595
pushArtifactFolder("source_tarball/", AWS_STASH_PATH)
96-
uploadTarballfromAWS("source_tarball/", AWS_STASH_PATH, 'source')
96+
uploadTarballfromAWS(params.CLOUD, "source_tarball/", AWS_STASH_PATH, 'source')
9797
}
9898
}
9999
stage('Build PBM generic source packages') {
@@ -108,7 +108,7 @@ pipeline {
108108
buildStage("oraclelinux:8", "--build_src_rpm=1")
109109

110110
pushArtifactFolder("srpm/", AWS_STASH_PATH)
111-
uploadRPMfromAWS("srpm/", AWS_STASH_PATH)
111+
uploadRPMfromAWS(params.CLOUD, "srpm/", AWS_STASH_PATH)
112112
}
113113
}
114114
stage('Build PBM generic source deb') {
@@ -121,7 +121,7 @@ pipeline {
121121
buildStage("ubuntu:focal", "--build_src_deb=1")
122122

123123
pushArtifactFolder("source_deb/", AWS_STASH_PATH)
124-
uploadDEBfromAWS("source_deb/", AWS_STASH_PATH)
124+
uploadDEBfromAWS(params.CLOUD, "source_deb/", AWS_STASH_PATH)
125125
}
126126
}
127127
} //parallel
@@ -138,7 +138,7 @@ pipeline {
138138
buildStage("oraclelinux:8", "--build_rpm=1")
139139

140140
pushArtifactFolder("rpm/", AWS_STASH_PATH)
141-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
141+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
142142
}
143143
}
144144
stage('Oracle Linux 8(aarch64)') {
@@ -151,7 +151,7 @@ pipeline {
151151
buildStage("oraclelinux:8", "--build_rpm=1")
152152

153153
pushArtifactFolder("rpm/", AWS_STASH_PATH)
154-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
154+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
155155
}
156156
}
157157
stage('Oracle Linux 9(x86_64)') {
@@ -164,7 +164,7 @@ pipeline {
164164
buildStage("oraclelinux:9", "--build_rpm=1")
165165

166166
pushArtifactFolder("rpm/", AWS_STASH_PATH)
167-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
167+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
168168
}
169169
}
170170
stage('Oracle Linux 9(aarch64)') {
@@ -177,7 +177,7 @@ pipeline {
177177
buildStage("oraclelinux:9", "--build_rpm=1")
178178

179179
pushArtifactFolder("rpm/", AWS_STASH_PATH)
180-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
180+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
181181
}
182182
}
183183
stage('Amazon Linux 2023(x86_64)') {
@@ -190,7 +190,7 @@ pipeline {
190190
buildStage("amazonlinux:2023", "--build_rpm=1")
191191

192192
pushArtifactFolder("rpm/", AWS_STASH_PATH)
193-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
193+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
194194
}
195195
}
196196
stage('Amazon Linux 2023(aarch64)') {
@@ -203,7 +203,7 @@ pipeline {
203203
buildStage("amazonlinux:2023", "--build_rpm=1")
204204

205205
pushArtifactFolder("rpm/", AWS_STASH_PATH)
206-
uploadRPMfromAWS("rpm/", AWS_STASH_PATH)
206+
uploadRPMfromAWS(params.CLOUD, "rpm/", AWS_STASH_PATH)
207207
}
208208
}
209209
stage('Ubuntu Focal 20.04(x86_64)') {
@@ -216,7 +216,7 @@ pipeline {
216216
buildStage("ubuntu:focal", "--build_deb=1")
217217

218218
pushArtifactFolder("deb/", AWS_STASH_PATH)
219-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
219+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
220220
}
221221
}
222222
stage('Ubuntu Focal 20.04(aarch64)') {
@@ -229,7 +229,7 @@ pipeline {
229229
buildStage("ubuntu:focal", "--build_deb=1")
230230

231231
pushArtifactFolder("deb/", AWS_STASH_PATH)
232-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
232+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
233233
}
234234
}
235235
stage('Ubuntu Jammy 22.04(x86_64)') {
@@ -242,7 +242,7 @@ pipeline {
242242
buildStage("ubuntu:jammy", "--build_deb=1")
243243

244244
pushArtifactFolder("deb/", AWS_STASH_PATH)
245-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
245+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
246246
}
247247
}
248248
stage('Ubuntu Jammy 22.04(aarch64)') {
@@ -255,7 +255,7 @@ pipeline {
255255
buildStage("ubuntu:jammy", "--build_deb=1")
256256

257257
pushArtifactFolder("deb/", AWS_STASH_PATH)
258-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
258+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
259259
}
260260
}
261261
stage('Ubuntu Noble 24.04(x86_64)') {
@@ -268,7 +268,7 @@ pipeline {
268268
buildStage("ubuntu:noble", "--build_deb=1")
269269

270270
pushArtifactFolder("deb/", AWS_STASH_PATH)
271-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
271+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
272272
}
273273
}
274274
stage('Ubuntu Noble 24.04(aarch64)') {
@@ -281,7 +281,7 @@ pipeline {
281281
buildStage("ubuntu:noble", "--build_deb=1")
282282

283283
pushArtifactFolder("deb/", AWS_STASH_PATH)
284-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
284+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
285285
}
286286
}
287287
stage('Debian Bullseye(11)') {
@@ -294,7 +294,7 @@ pipeline {
294294
buildStage("debian:bullseye", "--build_deb=1")
295295

296296
pushArtifactFolder("deb/", AWS_STASH_PATH)
297-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
297+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
298298
}
299299
}
300300
stage('Debian Bookworm(12)') {
@@ -307,7 +307,7 @@ pipeline {
307307
buildStage("debian:bookworm", "--build_deb=1")
308308

309309
pushArtifactFolder("deb/", AWS_STASH_PATH)
310-
uploadDEBfromAWS("deb/", AWS_STASH_PATH)
310+
uploadDEBfromAWS(params.CLOUD, "deb/", AWS_STASH_PATH)
311311
}
312312
}
313313
stage('Oraclelinux 8 tarball') {
@@ -320,7 +320,7 @@ pipeline {
320320
buildStage("oraclelinux:8", "--build_tarball=1")
321321

322322
pushArtifactFolder("tarball/", AWS_STASH_PATH)
323-
uploadTarballfromAWS("tarball/", AWS_STASH_PATH, 'binary')
323+
uploadTarballfromAWS(params.CLOUD, "tarball/", AWS_STASH_PATH, 'binary')
324324
}
325325
}
326326
}
@@ -335,7 +335,7 @@ pipeline {
335335
stage('Push to public repository') {
336336
steps {
337337
// sync packages
338-
sync2ProdAutoBuild(PBM_REPO, COMPONENT)
338+
sync2ProdAutoBuild(params.CLOUD, PBM_REPO, COMPONENT)
339339
}
340340
}
341341

‎vars/sync2ProdAutoBuild.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
def call(String REPO_NAME, String DESTINATION) {
2-
node('master') {
1+
def call(String CLOUD_NAME, String REPO_NAME, String DESTINATION) {
2+
def nodeLabel = (CLOUD_NAME == 'Hetzner') ? 'launcher-x64' : 'micro-amazon'
3+
node(nodeLabel) {
34
unstash 'uploadPath'
45
def path_to_build = sh(returnStdout: true, script: "cat uploadPath").trim()
56

‎vars/uploadDEBfromAWS.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
def call(String FOLDER_NAME, String AWS_STASH_PATH) {
2-
node('master') {
1+
def call(String CLOUD_NAME, String FOLDER_NAME, String AWS_STASH_PATH) {
2+
def nodeLabel = (CLOUD_NAME == 'Hetzner') ? 'launcher-x64' : 'micro-amazon'
3+
node(nodeLabel) {
34
deleteDir()
45
popArtifactFolder(FOLDER_NAME, AWS_STASH_PATH)
56
//unstash 'debs'

‎vars/uploadRPMfromAWS.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
def call(String FOLDER_NAME, String AWS_STASH_PATH) {
2-
node('master') {
1+
def call(String CLOUD_NAME, String FOLDER_NAME, String AWS_STASH_PATH) {
2+
def nodeLabel = (CLOUD_NAME == 'Hetzner') ? 'launcher-x64' : 'micro-amazon'
3+
node(nodeLabel) {
34
deleteDir()
45
popArtifactFolder(FOLDER_NAME, AWS_STASH_PATH)
56
unstash 'uploadPath'

‎vars/uploadTarballfromAWS.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
def call(String FOLDER_NAME, String AWS_STASH_PATH, String TarballType) {
2-
node('master') {
1+
def call(String CLOUD_NAME, String FOLDER_NAME, String AWS_STASH_PATH, String TarballType) {
2+
def nodeLabel = (CLOUD_NAME == 'Hetzner') ? 'launcher-x64' : 'micro-amazon'
3+
node(nodeLabel) {
34
deleteDir()
45
popArtifactFolder(FOLDER_NAME, AWS_STASH_PATH)
56
//unstash "${TarballType}.tarball"

0 commit comments

Comments
 (0)