tools: Add UPLOAD_DEST
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
parent
33ce8acb57
commit
8f478fe30b
|
@ -48,7 +48,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -80,26 +80,14 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
local set=$1 spec=$2
|
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
|
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
||||||
UPLOAD_DEST=${DEST_DEFAULT}
|
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
stage3.spec)
|
stage3.spec)
|
||||||
upload stage3-amd64-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-${TIMESTAMP}.tar.xz*
|
||||||
|
@ -126,7 +114,7 @@ post_build() {
|
||||||
popd >/dev/null || exit
|
popd >/dev/null || exit
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
||||||
UPLOAD_DEST=${DEST_HARDENED}
|
UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
hardened/stage3.spec)
|
hardened/stage3.spec)
|
||||||
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
|
||||||
|
|
|
@ -70,7 +70,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
else
|
else
|
||||||
echo Would now upload "$@"
|
echo Would now upload "$@"
|
||||||
ls -l $@
|
ls -l $@
|
||||||
|
|
|
@ -42,7 +42,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -48,7 +48,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -41,7 +41,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -47,7 +47,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -48,7 +48,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -71,7 +71,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
else
|
else
|
||||||
echo Would now upload "$@"
|
echo Would now upload "$@"
|
||||||
ls -l $@
|
ls -l $@
|
||||||
|
|
|
@ -58,7 +58,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -41,7 +41,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -43,7 +43,7 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|
|
@ -67,26 +67,14 @@ upload() {
|
||||||
--omit-dir-times
|
--omit-dir-times
|
||||||
--delay-updates
|
--delay-updates
|
||||||
)
|
)
|
||||||
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
|
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
|
||||||
}
|
}
|
||||||
|
|
||||||
post_build() {
|
post_build() {
|
||||||
local set=$1 spec=$2
|
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
|
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
||||||
UPLOAD_DEST=${DEST_DEFAULT}
|
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
stage3.spec)
|
stage3.spec)
|
||||||
upload stage3-i486-${TIMESTAMP}.tar.xz*
|
upload stage3-i486-${TIMESTAMP}.tar.xz*
|
||||||
|
@ -104,7 +92,7 @@ post_build() {
|
||||||
popd >/dev/null || exit
|
popd >/dev/null || exit
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
||||||
UPLOAD_DEST=${DEST_HARDENED}
|
UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
hardened/stage3.spec)
|
hardened/stage3.spec)
|
||||||
upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
|
upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
|
||||||
|
|
Loading…
Reference in a new issue