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:52
Message-Id: 1612058187.e357bcd8673a5e86c152a0e584762a363715a0a8.mattst88@gentoo
1 commit: e357bcd8673a5e86c152a0e584762a363715a0a8
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 00:16:03 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 01:56:27 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e357bcd8
7
8 tools: Add SSH_CMD array
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 tools/catalyst-auto-alpha.conf | 9 ++++++++-
13 tools/catalyst-auto-amd64.conf | 9 ++++++++-
14 tools/catalyst-auto-arm.conf | 9 ++++++++-
15 tools/catalyst-auto-arm64.conf | 9 ++++++++-
16 tools/catalyst-auto-hppa.conf | 9 ++++++++-
17 tools/catalyst-auto-ia64.conf | 9 ++++++++-
18 tools/catalyst-auto-ppc.conf | 9 ++++++++-
19 tools/catalyst-auto-ppc64le.conf | 9 ++++++++-
20 tools/catalyst-auto-qemu-arm.conf | 9 ++++++++-
21 tools/catalyst-auto-qemu-riscv.conf | 9 ++++++++-
22 tools/catalyst-auto-s390.conf | 9 ++++++++-
23 tools/catalyst-auto-s390x.conf | 9 ++++++++-
24 tools/catalyst-auto-sparc64.conf | 9 ++++++++-
25 tools/catalyst-auto-x86.conf | 9 ++++++++-
26 14 files changed, 112 insertions(+), 14 deletions(-)
27
28 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
29 index a60f979d..ebaff6eb 100644
30 --- a/tools/catalyst-auto-alpha.conf
31 +++ b/tools/catalyst-auto-alpha.conf
32 @@ -35,7 +35,14 @@ update_symlinks() {
33
34 upload() {
35 echo Uploading "$@"
36 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
37 + local SSH_CMD=(
38 + ssh
39 + -i ${UPLOAD_KEY}
40 + -o UserKnownHostsFile=/dev/null
41 + -o VerifyHostKeyDNS=yes
42 + -o StrictHostKeyChecking=no
43 + )
44 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
45 }
46
47 post_build() {
48
49 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
50 index 16aeda56..0ef11f2f 100644
51 --- a/tools/catalyst-auto-amd64.conf
52 +++ b/tools/catalyst-auto-amd64.conf
53 @@ -67,8 +67,15 @@ update_symlinks() {
54
55 upload() {
56 echo " ** Uploading $@"
57 + local SSH_CMD=(
58 + ssh
59 + -i ${UPLOAD_KEY}
60 + -o UserKnownHostsFile=/dev/null
61 + -o VerifyHostKeyDNS=yes
62 + -o StrictHostKeyChecking=no
63 + )
64 rsync \
65 - -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
66 + -e "${SSH_CMD[*]}" \
67 -a \
68 --omit-dir-times \
69 --delay-updates \
70
71 diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
72 index 56459c50..26fe8156 100644
73 --- a/tools/catalyst-auto-arm.conf
74 +++ b/tools/catalyst-auto-arm.conf
75 @@ -57,7 +57,14 @@ update_symlinks() {
76 upload() {
77 if [[ ${nonetwork} == 0 ]]; then
78 echo Uploading "$@"
79 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
80 + local SSH_CMD=(
81 + ssh
82 + -i ${UPLOAD_KEY}
83 + -o UserKnownHostsFile=/dev/null
84 + -o VerifyHostKeyDNS=yes
85 + -o StrictHostKeyChecking=no
86 + )
87 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
88 else
89 echo Would now upload "$@"
90 ls -l $@
91
92 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
93 index 064e6f41..9f457989 100644
94 --- a/tools/catalyst-auto-arm64.conf
95 +++ b/tools/catalyst-auto-arm64.conf
96 @@ -29,7 +29,14 @@ update_symlinks() {
97 }
98
99 upload() {
100 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
101 + local SSH_CMD=(
102 + ssh
103 + -i ${UPLOAD_KEY}
104 + -o UserKnownHostsFile=/dev/null
105 + -o VerifyHostKeyDNS=yes
106 + -o StrictHostKeyChecking=no
107 + )
108 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
109 }
110
111 post_build() {
112
113 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
114 index d2034010..8b465421 100644
115 --- a/tools/catalyst-auto-hppa.conf
116 +++ b/tools/catalyst-auto-hppa.conf
117 @@ -35,7 +35,14 @@ update_symlinks() {
118 }
119
120 upload() {
121 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
122 + local SSH_CMD=(
123 + ssh
124 + -i ${UPLOAD_KEY}
125 + -o UserKnownHostsFile=/dev/null
126 + -o VerifyHostKeyDNS=yes
127 + -o StrictHostKeyChecking=no
128 + )
129 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
130 }
131
132 post_build() {
133
134 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
135 index 845ffc51..6c78c8a7 100644
136 --- a/tools/catalyst-auto-ia64.conf
137 +++ b/tools/catalyst-auto-ia64.conf
138 @@ -28,7 +28,14 @@ update_symlinks() {
139 }
140
141 upload() {
142 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
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 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
151 }
152
153 post_build() {
154
155 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
156 index 8628f30f..a1286726 100644
157 --- a/tools/catalyst-auto-ppc.conf
158 +++ b/tools/catalyst-auto-ppc.conf
159 @@ -34,7 +34,14 @@ update_symlinks() {
160 }
161
162 upload() {
163 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
164 + local SSH_CMD=(
165 + ssh
166 + -i ${UPLOAD_KEY}
167 + -o UserKnownHostsFile=/dev/null
168 + -o VerifyHostKeyDNS=yes
169 + -o StrictHostKeyChecking=no
170 + )
171 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
172 }
173
174 post_build() {
175
176 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
177 index 716e43fd..0d54fab9 100644
178 --- a/tools/catalyst-auto-ppc64le.conf
179 +++ b/tools/catalyst-auto-ppc64le.conf
180 @@ -35,7 +35,14 @@ update_symlinks() {
181 }
182
183 upload() {
184 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
185 + local SSH_CMD=(
186 + ssh
187 + -i ${UPLOAD_KEY}
188 + -o UserKnownHostsFile=/dev/null
189 + -o VerifyHostKeyDNS=yes
190 + -o StrictHostKeyChecking=no
191 + )
192 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
193 }
194
195 post_build() {
196
197 diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
198 index c351e99b..1a121997 100644
199 --- a/tools/catalyst-auto-qemu-arm.conf
200 +++ b/tools/catalyst-auto-qemu-arm.conf
201 @@ -58,7 +58,14 @@ update_symlinks() {
202 upload() {
203 if [[ ${nonetwork} == 0 ]]; then
204 echo Uploading "$@"
205 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
206 + local SSH_CMD=(
207 + ssh
208 + -i ${UPLOAD_KEY}
209 + -o UserKnownHostsFile=/dev/null
210 + -o VerifyHostKeyDNS=yes
211 + -o StrictHostKeyChecking=no
212 + )
213 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
214 else
215 echo Would now upload "$@"
216 ls -l $@
217
218 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
219 index 14e2b561..b19de76f 100644
220 --- a/tools/catalyst-auto-qemu-riscv.conf
221 +++ b/tools/catalyst-auto-qemu-riscv.conf
222 @@ -45,7 +45,14 @@ update_symlinks() {
223 upload() {
224 if [[ ${nonetwork} == 0 ]]; then
225 echo Uploading "$@"
226 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
227 + local SSH_CMD=(
228 + ssh
229 + -i ${UPLOAD_KEY}
230 + -o UserKnownHostsFile=/dev/null
231 + -o VerifyHostKeyDNS=yes
232 + -o StrictHostKeyChecking=no
233 + )
234 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
235 fi
236 }
237
238
239 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
240 index 8f59d581..5716702c 100644
241 --- a/tools/catalyst-auto-s390.conf
242 +++ b/tools/catalyst-auto-s390.conf
243 @@ -28,7 +28,14 @@ update_symlinks() {
244 }
245
246 upload() {
247 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
248 + local SSH_CMD=(
249 + ssh
250 + -i ${UPLOAD_KEY}
251 + -o UserKnownHostsFile=/dev/null
252 + -o VerifyHostKeyDNS=yes
253 + -o StrictHostKeyChecking=no
254 + )
255 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
256 }
257
258 post_build() {
259
260 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
261 index 241179d5..3b4fd21c 100644
262 --- a/tools/catalyst-auto-s390x.conf
263 +++ b/tools/catalyst-auto-s390x.conf
264 @@ -28,7 +28,14 @@ update_symlinks() {
265 }
266
267 upload() {
268 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
269 + local SSH_CMD=(
270 + ssh
271 + -i ${UPLOAD_KEY}
272 + -o UserKnownHostsFile=/dev/null
273 + -o VerifyHostKeyDNS=yes
274 + -o StrictHostKeyChecking=no
275 + )
276 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
277 }
278
279 post_build() {
280
281 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
282 index fd963987..bc441b2d 100644
283 --- a/tools/catalyst-auto-sparc64.conf
284 +++ b/tools/catalyst-auto-sparc64.conf
285 @@ -30,7 +30,14 @@ update_symlinks() {
286 }
287
288 upload() {
289 - rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
290 + local SSH_CMD=(
291 + ssh
292 + -i ${UPLOAD_KEY}
293 + -o UserKnownHostsFile=/dev/null
294 + -o VerifyHostKeyDNS=yes
295 + -o StrictHostKeyChecking=no
296 + )
297 + rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
298 }
299
300 post_build() {
301
302 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
303 index 4753c3fe..ef983969 100644
304 --- a/tools/catalyst-auto-x86.conf
305 +++ b/tools/catalyst-auto-x86.conf
306 @@ -54,8 +54,15 @@ update_symlinks() {
307
308 upload() {
309 echo " ** Uploading $@"
310 + local SSH_CMD=(
311 + ssh
312 + -i ${UPLOAD_KEY}
313 + -o UserKnownHostsFile=/dev/null
314 + -o VerifyHostKeyDNS=yes
315 + -o StrictHostKeyChecking=no
316 + )
317 rsync \
318 - -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
319 + -e "${SSH_CMD[*]}" \
320 -a \
321 --omit-dir-times \
322 --delay-updates \
Report Message
Find on MARC Find on Google Groups