Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Mon, 01 Feb 2021 04:04:53
Message-Id: 1612058232.7ec486fab44faf29fc8abbedf9449f64088a89de.mattst88@gentoo
1 commit: 7ec486fab44faf29fc8abbedf9449f64088a89de
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 01:02:35 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 01:57:12 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7ec486fa
7
8 tools: Consolidate upload() function
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 tools/catalyst-auto | 24 +++++++++++++++++++++++-
13 tools/catalyst-auto-alpha.conf | 18 ------------------
14 tools/catalyst-auto-amd64.conf | 18 ------------------
15 tools/catalyst-auto-arm.conf | 23 -----------------------
16 tools/catalyst-auto-arm64.conf | 17 -----------------
17 tools/catalyst-auto-hppa.conf | 17 -----------------
18 tools/catalyst-auto-ia64.conf | 17 -----------------
19 tools/catalyst-auto-ppc.conf | 17 -----------------
20 tools/catalyst-auto-ppc64le.conf | 17 -----------------
21 tools/catalyst-auto-qemu-arm.conf | 23 -----------------------
22 tools/catalyst-auto-qemu-riscv.conf | 20 --------------------
23 tools/catalyst-auto-s390.conf | 17 -----------------
24 tools/catalyst-auto-s390x.conf | 17 -----------------
25 tools/catalyst-auto-sparc64.conf | 17 -----------------
26 tools/catalyst-auto-x86.conf | 18 ------------------
27 15 files changed, 23 insertions(+), 257 deletions(-)
28
29 diff --git a/tools/catalyst-auto b/tools/catalyst-auto
30 index 203abe81..0f0eae34 100755
31 --- a/tools/catalyst-auto
32 +++ b/tools/catalyst-auto
33 @@ -47,7 +47,6 @@ Options:
34 --interval <days> Exit if last successful run was less than <days> ago
35 -l|--lock <file> File to grab a lock on to prevent multiple invocations
36 -X|--nonetwork Do not perform network operations (like uploading result)
37 - This needs to be supported by the config file as well.
38 -h|--help Show this message and quit
39
40 EOH
41 @@ -270,6 +269,29 @@ verify_dnssec() {
42 fi
43 }
44
45 +upload() {
46 + if [[ ${nonetwork} == 0 ]]; then
47 + echo Uploading "$@"
48 + local SSH_CMD=(
49 + ssh
50 + -i ${UPLOAD_KEY}
51 + -o UserKnownHostsFile=/dev/null
52 + -o VerifyHostKeyDNS=yes
53 + -o StrictHostKeyChecking=no
54 + )
55 + local RSYNC_OPTS=(
56 + -e "${SSH_CMD[*]}"
57 + --archive
58 + --omit-dir-times
59 + --delay-updates
60 + )
61 + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
62 + else
63 + echo Would now upload "$@"
64 + ls -l $@
65 + fi
66 +}
67 +
68 run_catalyst_commands() {
69 doneconfig=0
70 for config_file in "${config_files[@]}"; do
71
72 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
73 index c2359f59..f755c9b5 100644
74 --- a/tools/catalyst-auto-alpha.conf
75 +++ b/tools/catalyst-auto-alpha.conf
76 @@ -33,24 +33,6 @@ update_symlinks() {
77 done
78 }
79
80 -upload() {
81 - echo Uploading "$@"
82 - local SSH_CMD=(
83 - ssh
84 - -i ${UPLOAD_KEY}
85 - -o UserKnownHostsFile=/dev/null
86 - -o VerifyHostKeyDNS=yes
87 - -o StrictHostKeyChecking=no
88 - )
89 - local RSYNC_OPTS=(
90 - -e "${SSH_CMD[*]}"
91 - --archive
92 - --omit-dir-times
93 - --delay-updates
94 - )
95 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
96 -}
97 -
98 post_build() {
99 local set=$1 spec=$2
100
101
102 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
103 index 0b07c988..b14013f7 100644
104 --- a/tools/catalyst-auto-amd64.conf
105 +++ b/tools/catalyst-auto-amd64.conf
106 @@ -65,24 +65,6 @@ update_symlinks() {
107 done
108 }
109
110 -upload() {
111 - echo " ** Uploading $@"
112 - local SSH_CMD=(
113 - ssh
114 - -i ${UPLOAD_KEY}
115 - -o UserKnownHostsFile=/dev/null
116 - -o VerifyHostKeyDNS=yes
117 - -o StrictHostKeyChecking=no
118 - )
119 - local RSYNC_OPTS=(
120 - -e "${SSH_CMD[*]}"
121 - --archive
122 - --omit-dir-times
123 - --delay-updates
124 - )
125 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
126 -}
127 -
128 post_build() {
129 local set=$1 spec=$2
130
131
132 diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
133 index b15d3569..829ff4c5 100644
134 --- a/tools/catalyst-auto-arm.conf
135 +++ b/tools/catalyst-auto-arm.conf
136 @@ -54,29 +54,6 @@ update_symlinks() {
137 done
138 }
139
140 -upload() {
141 - if [[ ${nonetwork} == 0 ]]; then
142 - echo Uploading "$@"
143 - local SSH_CMD=(
144 - ssh
145 - -i ${UPLOAD_KEY}
146 - -o UserKnownHostsFile=/dev/null
147 - -o VerifyHostKeyDNS=yes
148 - -o StrictHostKeyChecking=no
149 - )
150 - local RSYNC_OPTS=(
151 - -e "${SSH_CMD[*]}"
152 - --archive
153 - --omit-dir-times
154 - --delay-updates
155 - )
156 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
157 - else
158 - echo Would now upload "$@"
159 - ls -l $@
160 - fi
161 -}
162 -
163 post_build() {
164 local set=$1 spec=$2
165
166
167 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
168 index c14cb56b..5346153f 100644
169 --- a/tools/catalyst-auto-arm64.conf
170 +++ b/tools/catalyst-auto-arm64.conf
171 @@ -28,23 +28,6 @@ update_symlinks() {
172 done
173 }
174
175 -upload() {
176 - local SSH_CMD=(
177 - ssh
178 - -i ${UPLOAD_KEY}
179 - -o UserKnownHostsFile=/dev/null
180 - -o VerifyHostKeyDNS=yes
181 - -o StrictHostKeyChecking=no
182 - )
183 - local RSYNC_OPTS=(
184 - -e "${SSH_CMD[*]}"
185 - --archive
186 - --omit-dir-times
187 - --delay-updates
188 - )
189 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
190 -}
191 -
192 post_build() {
193 local set=$1 spec=$2
194
195
196 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
197 index d93a1370..8ad8f767 100644
198 --- a/tools/catalyst-auto-hppa.conf
199 +++ b/tools/catalyst-auto-hppa.conf
200 @@ -34,23 +34,6 @@ update_symlinks() {
201 done
202 }
203
204 -upload() {
205 - local SSH_CMD=(
206 - ssh
207 - -i ${UPLOAD_KEY}
208 - -o UserKnownHostsFile=/dev/null
209 - -o VerifyHostKeyDNS=yes
210 - -o StrictHostKeyChecking=no
211 - )
212 - local RSYNC_OPTS=(
213 - -e "${SSH_CMD[*]}"
214 - --archive
215 - --omit-dir-times
216 - --delay-updates
217 - )
218 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
219 -}
220 -
221 post_build() {
222 local set=$1 spec=$2
223
224
225 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
226 index 852be0d4..009d5fd9 100644
227 --- a/tools/catalyst-auto-ia64.conf
228 +++ b/tools/catalyst-auto-ia64.conf
229 @@ -27,23 +27,6 @@ update_symlinks() {
230 done
231 }
232
233 -upload() {
234 - local SSH_CMD=(
235 - ssh
236 - -i ${UPLOAD_KEY}
237 - -o UserKnownHostsFile=/dev/null
238 - -o VerifyHostKeyDNS=yes
239 - -o StrictHostKeyChecking=no
240 - )
241 - local RSYNC_OPTS=(
242 - -e "${SSH_CMD[*]}"
243 - --archive
244 - --omit-dir-times
245 - --delay-updates
246 - )
247 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
248 -}
249 -
250 post_build() {
251 local set=$1 spec=$2
252
253
254 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
255 index 68f49290..3a81822e 100644
256 --- a/tools/catalyst-auto-ppc.conf
257 +++ b/tools/catalyst-auto-ppc.conf
258 @@ -32,23 +32,6 @@ update_symlinks() {
259 popd >/dev/null
260 done
261 }
262 -
263 -upload() {
264 - local SSH_CMD=(
265 - ssh
266 - -i ${UPLOAD_KEY}
267 - -o UserKnownHostsFile=/dev/null
268 - -o VerifyHostKeyDNS=yes
269 - -o StrictHostKeyChecking=no
270 - )
271 - local RSYNC_OPTS=(
272 - -e "${SSH_CMD[*]}"
273 - --archive
274 - --omit-dir-times
275 - --delay-updates
276 - )
277 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
278 -}
279
280 post_build() {
281 local set=$1 spec=$2
282
283 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
284 index ecd4a738..a93975ca 100644
285 --- a/tools/catalyst-auto-ppc64le.conf
286 +++ b/tools/catalyst-auto-ppc64le.conf
287 @@ -34,23 +34,6 @@ update_symlinks() {
288 done
289 }
290
291 -upload() {
292 - local SSH_CMD=(
293 - ssh
294 - -i ${UPLOAD_KEY}
295 - -o UserKnownHostsFile=/dev/null
296 - -o VerifyHostKeyDNS=yes
297 - -o StrictHostKeyChecking=no
298 - )
299 - local RSYNC_OPTS=(
300 - -e "${SSH_CMD[*]}"
301 - --archive
302 - --omit-dir-times
303 - --delay-updates
304 - )
305 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
306 -}
307 -
308 post_build() {
309 local set=$1 spec=$2
310
311
312 diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
313 index 68b51a2d..0e2d7826 100644
314 --- a/tools/catalyst-auto-qemu-arm.conf
315 +++ b/tools/catalyst-auto-qemu-arm.conf
316 @@ -55,29 +55,6 @@ update_symlinks() {
317 done
318 }
319
320 -upload() {
321 - if [[ ${nonetwork} == 0 ]]; then
322 - echo Uploading "$@"
323 - local SSH_CMD=(
324 - ssh
325 - -i ${UPLOAD_KEY}
326 - -o UserKnownHostsFile=/dev/null
327 - -o VerifyHostKeyDNS=yes
328 - -o StrictHostKeyChecking=no
329 - )
330 - local RSYNC_OPTS=(
331 - -e "${SSH_CMD[*]}"
332 - --archive
333 - --omit-dir-times
334 - --delay-updates
335 - )
336 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
337 - else
338 - echo Would now upload "$@"
339 - ls -l $@
340 - fi
341 -}
342 -
343 post_build() {
344 local set=$1 spec=$2
345
346
347 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
348 index ce73642b..e809b598 100644
349 --- a/tools/catalyst-auto-qemu-riscv.conf
350 +++ b/tools/catalyst-auto-qemu-riscv.conf
351 @@ -42,26 +42,6 @@ update_symlinks() {
352 done
353 }
354
355 -upload() {
356 - if [[ ${nonetwork} == 0 ]]; then
357 - echo Uploading "$@"
358 - local SSH_CMD=(
359 - ssh
360 - -i ${UPLOAD_KEY}
361 - -o UserKnownHostsFile=/dev/null
362 - -o VerifyHostKeyDNS=yes
363 - -o StrictHostKeyChecking=no
364 - )
365 - local RSYNC_OPTS=(
366 - -e "${SSH_CMD[*]}"
367 - --archive
368 - --omit-dir-times
369 - --delay-updates
370 - )
371 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
372 - fi
373 -}
374 -
375 post_build() {
376 local set=$1 spec=$2
377
378
379 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
380 index 11bdf6cc..15b5382b 100644
381 --- a/tools/catalyst-auto-s390.conf
382 +++ b/tools/catalyst-auto-s390.conf
383 @@ -27,23 +27,6 @@ update_symlinks() {
384 done
385 }
386
387 -upload() {
388 - local SSH_CMD=(
389 - ssh
390 - -i ${UPLOAD_KEY}
391 - -o UserKnownHostsFile=/dev/null
392 - -o VerifyHostKeyDNS=yes
393 - -o StrictHostKeyChecking=no
394 - )
395 - local RSYNC_OPTS=(
396 - -e "${SSH_CMD[*]}"
397 - --archive
398 - --omit-dir-times
399 - --delay-updates
400 - )
401 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
402 -}
403 -
404 post_build() {
405 local set=$1 spec=$2
406
407
408 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
409 index 1a5ea91d..5a351358 100644
410 --- a/tools/catalyst-auto-s390x.conf
411 +++ b/tools/catalyst-auto-s390x.conf
412 @@ -27,23 +27,6 @@ update_symlinks() {
413 done
414 }
415
416 -upload() {
417 - local SSH_CMD=(
418 - ssh
419 - -i ${UPLOAD_KEY}
420 - -o UserKnownHostsFile=/dev/null
421 - -o VerifyHostKeyDNS=yes
422 - -o StrictHostKeyChecking=no
423 - )
424 - local RSYNC_OPTS=(
425 - -e "${SSH_CMD[*]}"
426 - --archive
427 - --omit-dir-times
428 - --delay-updates
429 - )
430 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
431 -}
432 -
433 post_build() {
434 local set=$1 spec=$2
435
436
437 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
438 index 77dd62ee..668971db 100644
439 --- a/tools/catalyst-auto-sparc64.conf
440 +++ b/tools/catalyst-auto-sparc64.conf
441 @@ -29,23 +29,6 @@ update_symlinks() {
442 done
443 }
444
445 -upload() {
446 - local SSH_CMD=(
447 - ssh
448 - -i ${UPLOAD_KEY}
449 - -o UserKnownHostsFile=/dev/null
450 - -o VerifyHostKeyDNS=yes
451 - -o StrictHostKeyChecking=no
452 - )
453 - local RSYNC_OPTS=(
454 - -e "${SSH_CMD[*]}"
455 - --archive
456 - --omit-dir-times
457 - --delay-updates
458 - )
459 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
460 -}
461 -
462 post_build() {
463 local set=$1 spec=$2
464
465
466 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
467 index bb779d7e..5822d992 100644
468 --- a/tools/catalyst-auto-x86.conf
469 +++ b/tools/catalyst-auto-x86.conf
470 @@ -52,24 +52,6 @@ update_symlinks() {
471 done
472 }
473
474 -upload() {
475 - echo " ** Uploading $@"
476 - local SSH_CMD=(
477 - ssh
478 - -i ${UPLOAD_KEY}
479 - -o UserKnownHostsFile=/dev/null
480 - -o VerifyHostKeyDNS=yes
481 - -o StrictHostKeyChecking=no
482 - )
483 - local RSYNC_OPTS=(
484 - -e "${SSH_CMD[*]}"
485 - --archive
486 - --omit-dir-times
487 - --delay-updates
488 - )
489 - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
490 -}
491 -
492 post_build() {
493 local set=$1 spec=$2
Report Message
Find on MARC Find on Google Groups