commit: 8f478fe30ba9f3a43df0753fc8369f93b509f4af
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 01:00:37 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f478fe3
tools: Add UPLOAD_DEST
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64.conf | 18 +++---------------
tools/catalyst-auto-arm.conf | 2 +-
tools/catalyst-auto-arm64.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-qemu-arm.conf | 2 +-
tools/catalyst-auto-qemu-riscv.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86.conf | 18 +++---------------
14 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 6a233900..c2359f59 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 363c80cb..0b07c988 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -80,26 +80,14 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
local set=$1 spec=$2
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop
a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
-
DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-amd64-${TIMESTAMP}.tar.xz*
@@ -126,7 +114,7 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 5c78ab99..b15d3569 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -70,7 +70,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f1ce7ab1..c14cb56b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -42,7 +42,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 6ba59c81..d93a1370 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 1d123d2a..852be0d4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 61354d22..68f49290 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -47,7 +47,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a8e438e1..ecd4a738 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf
b/tools/catalyst-auto-qemu-arm.conf
index 68f583ef..68b51a2d 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -71,7 +71,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf
b/tools/catalyst-auto-qemu-riscv.conf
index 035c0ee7..ce73642b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -58,7 +58,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e442414c..11bdf6cc 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 980b721d..1a5ea91d 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 1b730c54..77dd62ee 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -43,7 +43,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1c809465..bb779d7e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -67,26 +67,14 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
+ rsync "${RSYNC_OPTS[@]}" "$@"
${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
local set=$1 spec=$2
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop
a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
-
DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-
DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-i486-${TIMESTAMP}.tar.xz*
@@ -104,7 +92,7 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
