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