commit: 8f5cec8809109e97da564d6cf2a6ea1f335512a5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 21:38:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 21:41:13 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f5cec88
Revert "Upload stages to releng-incoming.gentoo.org"
This causes an interactive prompt:
Are you sure you want to continue connecting (yes/no/[fingerprint])?
The plan is to get the SSH fingerprint via DNSSEC, so I'll revert this
change until that is in place and wired up.
This reverts commit 63174346f265830ae8fce6ad3860bcb894069123.
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 b60f17e8..b218fa0e 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 a2f2cec6..37e01bd1 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}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@nightheron.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 ab2ac660..c2e0c8b1 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}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@nightheron.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 004560a0..0d1506a4 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 662b2895..fa20b5ca 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 ffb6d34e..79975984 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 d30f4147..0db433fa 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 46e9e9cf..ca12d89d 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 34ecd6c5..1b13c6b5 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 9bc947e9..c3037712 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 4b13e28b..5444cc4e 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 13258032..b3328ed3 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 ddf661c0..59572644 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 04abc577..76e1bdf5 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 a15df683..b48c7536 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 1141b3b9..c9f3f7e9 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 18cbfb9d..0eeaddd6 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 5d147ab8..2373041e 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}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@nightheron.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 bdd9fe35..52f07b12 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}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
