commit: 63174346f265830ae8fce6ad3860bcb894069123
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 07:14:11 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 07:14:11 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=63174346
Upload stages to releng-incoming.gentoo.org
Most architecture's build systems are hosted at OSUOSL. The place the
stages need to end up is ultimately masterreleases.gentoo.org, also at
OSUOSL. For some unknown reason, instead of rsync'ing from one system to
another in the same building, we were sending the stages first (slowly,
I might add) to nightheron in France, before sending them back to
OSUOSL.
robbat2 has added a releng-incoming.gentoo.org DNS record that currently
points to nightheron. This will allow us to switch the record in the
future and save the stages from needing to circumnavigate the globe
before reaching the mirrors.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 4 ++--
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 4 ++--
tools/catalyst-auto-x86.conf | 4 ++--
19 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b218fa0e..b60f17e8 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,7 +33,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf
b/tools/catalyst-auto-amd64-experimental.conf
index 37e01bd1..a2f2cec6 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -75,8 +75,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
-
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c2e0c8b1..ab2ac660 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,8 +76,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
-
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0d1506a4..004560a0 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index fa20b5ca..662b2895 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-armv5tel.conf
b/tools/catalyst-auto-armv5tel.conf
index 79975984..ffb6d34e 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0db433fa..d30f4147 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf
b/tools/catalyst-auto-armv6j_hardfp.conf
index ca12d89d..46e9e9cf 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 1b13c6b5..34ecd6c5 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf
b/tools/catalyst-auto-armv7a_hardfp.conf
index c3037712..9bc947e9 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
[email protected]:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 5444cc4e..4b13e28b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -33,7 +33,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@"
[email protected]:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b3328ed3..13258032 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 59572644..ddf661c0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 76e1bdf5..04abc577 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index b48c7536..a15df683 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c9f3f7e9..1141b3b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 0eeaddd6..18cbfb9d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" [email protected]:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@"
[email protected]:
}
post_build() {
diff --git a/tools/catalyst-auto-x86-experimental.conf
b/tools/catalyst-auto-x86-experimental.conf
index 2373041e..5d147ab8 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -54,8 +54,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
-
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 52f07b12..bdd9fe35 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -62,8 +62,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
-
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
