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: Thu, 23 Apr 2020 21:41:27
Message-Id: 1587678073.8f5cec8809109e97da564d6cf2a6ea1f335512a5.mattst88@gentoo
1 commit: 8f5cec8809109e97da564d6cf2a6ea1f335512a5
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 23 21:38:00 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 21:41:13 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f5cec88
7
8 Revert "Upload stages to releng-incoming.gentoo.org"
9
10 This causes an interactive prompt:
11
12 Are you sure you want to continue connecting (yes/no/[fingerprint])?
13
14 The plan is to get the SSH fingerprint via DNSSEC, so I'll revert this
15 change until that is in place and wired up.
16
17 This reverts commit 63174346f265830ae8fce6ad3860bcb894069123.
18
19 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
20
21 tools/catalyst-auto-alpha.conf | 2 +-
22 tools/catalyst-auto-amd64-experimental.conf | 4 ++--
23 tools/catalyst-auto-amd64.conf | 4 ++--
24 tools/catalyst-auto-arm64.conf | 2 +-
25 tools/catalyst-auto-armv4tl.conf | 2 +-
26 tools/catalyst-auto-armv5tel.conf | 2 +-
27 tools/catalyst-auto-armv6j.conf | 2 +-
28 tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
29 tools/catalyst-auto-armv7a.conf | 2 +-
30 tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
31 tools/catalyst-auto-hppa.conf | 2 +-
32 tools/catalyst-auto-ia64.conf | 2 +-
33 tools/catalyst-auto-ppc.conf | 2 +-
34 tools/catalyst-auto-ppc64le.conf | 2 +-
35 tools/catalyst-auto-s390.conf | 2 +-
36 tools/catalyst-auto-s390x.conf | 2 +-
37 tools/catalyst-auto-sparc64.conf | 2 +-
38 tools/catalyst-auto-x86-experimental.conf | 4 ++--
39 tools/catalyst-auto-x86.conf | 4 ++--
40 19 files changed, 23 insertions(+), 23 deletions(-)
41
42 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
43 index b60f17e8..b218fa0e 100644
44 --- a/tools/catalyst-auto-alpha.conf
45 +++ b/tools/catalyst-auto-alpha.conf
46 @@ -33,7 +33,7 @@ update_symlinks() {
47
48 upload() {
49 echo Uploading "$@"
50 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@××××××××××××××××××××××.org:
51 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@×××××××××××××××××.org:
52 }
53
54 post_build() {
55
56 diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
57 index a2f2cec6..37e01bd1 100644
58 --- a/tools/catalyst-auto-amd64-experimental.conf
59 +++ b/tools/catalyst-auto-amd64-experimental.conf
60 @@ -75,8 +75,8 @@ post_build() {
61 DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
62 ;;
63 *)
64 - DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
65 - DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
66 + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
67 + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
68 ;;
69 esac
70 pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
71
72 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
73 index ab2ac660..c2e0c8b1 100644
74 --- a/tools/catalyst-auto-amd64.conf
75 +++ b/tools/catalyst-auto-amd64.conf
76 @@ -76,8 +76,8 @@ post_build() {
77 DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
78 ;;
79 *)
80 - DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
81 - DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
82 + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
83 + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
84 ;;
85 esac
86 pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
87
88 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
89 index 004560a0..0d1506a4 100644
90 --- a/tools/catalyst-auto-arm64.conf
91 +++ b/tools/catalyst-auto-arm64.conf
92 @@ -29,7 +29,7 @@ update_symlinks() {
93 }
94
95 upload() {
96 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@××××××××××××××××××××××.org:
97 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@×××××××××××××××××.org:
98 }
99
100 post_build() {
101
102 diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
103 index 662b2895..fa20b5ca 100644
104 --- a/tools/catalyst-auto-armv4tl.conf
105 +++ b/tools/catalyst-auto-armv4tl.conf
106 @@ -30,5 +30,5 @@ update_symlinks() {
107
108
109 post_build() {
110 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
111 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
112 }
113
114 diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
115 index ffb6d34e..79975984 100644
116 --- a/tools/catalyst-auto-armv5tel.conf
117 +++ b/tools/catalyst-auto-armv5tel.conf
118 @@ -30,5 +30,5 @@ update_symlinks() {
119
120
121 post_build() {
122 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
123 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
124 }
125
126 diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
127 index d30f4147..0db433fa 100644
128 --- a/tools/catalyst-auto-armv6j.conf
129 +++ b/tools/catalyst-auto-armv6j.conf
130 @@ -30,5 +30,5 @@ update_symlinks() {
131
132
133 post_build() {
134 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
135 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
136 }
137
138 diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
139 index 46e9e9cf..ca12d89d 100644
140 --- a/tools/catalyst-auto-armv6j_hardfp.conf
141 +++ b/tools/catalyst-auto-armv6j_hardfp.conf
142 @@ -30,5 +30,5 @@ update_symlinks() {
143
144
145 post_build() {
146 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
147 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
148 }
149
150 diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
151 index 34ecd6c5..1b13c6b5 100644
152 --- a/tools/catalyst-auto-armv7a.conf
153 +++ b/tools/catalyst-auto-armv7a.conf
154 @@ -30,5 +30,5 @@ update_symlinks() {
155
156
157 post_build() {
158 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
159 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
160 }
161
162 diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
163 index 9bc947e9..c3037712 100644
164 --- a/tools/catalyst-auto-armv7a_hardfp.conf
165 +++ b/tools/catalyst-auto-armv7a_hardfp.conf
166 @@ -30,5 +30,5 @@ update_symlinks() {
167
168
169 post_build() {
170 - rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@××××××××××××××××××××××.org:
171 + rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@×××××××××××××××××.org:
172 }
173
174 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
175 index 4b13e28b..5444cc4e 100644
176 --- a/tools/catalyst-auto-hppa.conf
177 +++ b/tools/catalyst-auto-hppa.conf
178 @@ -33,7 +33,7 @@ update_symlinks() {
179 }
180
181 upload() {
182 - rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@××××××××××××××××××××××.org:
183 + rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@×××××××××××××××××.org:
184 }
185
186 post_build() {
187
188 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
189 index 13258032..b3328ed3 100644
190 --- a/tools/catalyst-auto-ia64.conf
191 +++ b/tools/catalyst-auto-ia64.conf
192 @@ -26,7 +26,7 @@ update_symlinks() {
193 }
194
195 upload() {
196 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@××××××××××××××××××××××.org:
197 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@×××××××××××××××××.org:
198 }
199
200 post_build() {
201
202 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
203 index ddf661c0..59572644 100644
204 --- a/tools/catalyst-auto-ppc.conf
205 +++ b/tools/catalyst-auto-ppc.conf
206 @@ -32,7 +32,7 @@ update_symlinks() {
207 }
208
209 upload() {
210 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@××××××××××××××××××××××.org:
211 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@×××××××××××××××××.org:
212 }
213
214 post_build() {
215
216 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
217 index 04abc577..76e1bdf5 100644
218 --- a/tools/catalyst-auto-ppc64le.conf
219 +++ b/tools/catalyst-auto-ppc64le.conf
220 @@ -31,7 +31,7 @@ update_symlinks() {
221 }
222
223 upload() {
224 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@××××××××××××××××××××××.org:
225 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@×××××××××××××××××.org:
226 }
227
228 post_build() {
229
230 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
231 index a15df683..b48c7536 100644
232 --- a/tools/catalyst-auto-s390.conf
233 +++ b/tools/catalyst-auto-s390.conf
234 @@ -26,7 +26,7 @@ update_symlinks() {
235 }
236
237 upload() {
238 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@××××××××××××××××××××××.org:
239 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@×××××××××××××××××.org:
240 }
241
242 post_build() {
243
244 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
245 index 1141b3b9..c9f3f7e9 100644
246 --- a/tools/catalyst-auto-s390x.conf
247 +++ b/tools/catalyst-auto-s390x.conf
248 @@ -26,7 +26,7 @@ update_symlinks() {
249 }
250
251 upload() {
252 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@××××××××××××××××××××××.org:
253 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@×××××××××××××××××.org:
254 }
255
256 post_build() {
257
258 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
259 index 18cbfb9d..0eeaddd6 100644
260 --- a/tools/catalyst-auto-sparc64.conf
261 +++ b/tools/catalyst-auto-sparc64.conf
262 @@ -28,7 +28,7 @@ update_symlinks() {
263 }
264
265 upload() {
266 - rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@××××××××××××××××××××××.org:
267 + rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@×××××××××××××××××.org:
268 }
269
270 post_build() {
271
272 diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
273 index 5d147ab8..2373041e 100644
274 --- a/tools/catalyst-auto-x86-experimental.conf
275 +++ b/tools/catalyst-auto-x86-experimental.conf
276 @@ -54,8 +54,8 @@ post_build() {
277 DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
278 ;;
279 *)
280 - DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
281 - DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
282 + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
283 + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
284 ;;
285 esac
286 pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
287
288 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
289 index bdd9fe35..52f07b12 100644
290 --- a/tools/catalyst-auto-x86.conf
291 +++ b/tools/catalyst-auto-x86.conf
292 @@ -62,8 +62,8 @@ post_build() {
293 DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
294 ;;
295 *)
296 - DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
297 - DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
298 + DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
299 + DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
300 ;;
301 esac
302 pushd ${BUILD_SRCDIR_BASE}/default >/dev/null