catalyst-auto-amd64*.conf: explicitly list files to be transferred
Previously when we were copying locally there was no (major) problem with wildcarding a long list of files to be transferred after every single spec finishes. Now that we are transferring to a remote host, this results in a lot of wasted transfer time & bandwidth. I have adjusted the post_build function to only transfer the new files known to be produced by each spec (which has files meant to be published). Signed-off-by: Ben Kohler <bkohler@gentoo.org>
This commit is contained in:
Ben Kohler
parent
b9a6b09612
commit
915dc435ff
|
|
@ -26,6 +26,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
|
|||
|
||||
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
|
||||
|
||||
|
||||
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
|
||||
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
||||
SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
|
||||
|
|
@ -43,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
|
|||
update_symlinks() {
|
||||
# Symlink the latest stages3 to build from
|
||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||
pushd $d >/dev/null
|
||||
pushd "${d}" >/dev/null || exit
|
||||
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
|
||||
# 20yymmddThhmmssZ
|
||||
# 20yymmddhhmmss
|
||||
|
|
@ -57,11 +58,13 @@ update_symlinks() {
|
|||
<<<"$f")
|
||||
ln -svf "$f" "$of"
|
||||
done
|
||||
popd >/dev/null
|
||||
popd >/dev/null || exit
|
||||
done
|
||||
}
|
||||
|
||||
post_build() {
|
||||
local set=$1 spec=$2
|
||||
|
||||
cmd=(
|
||||
rsync
|
||||
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
|
||||
|
|
@ -80,34 +83,58 @@ post_build() {
|
|||
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
|
||||
;;
|
||||
esac
|
||||
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
|
||||
mkdir -p ${TMPDIR}/empty
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
"${cmd[@]}" ${file}* ${DEST_DEFAULT}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
|
||||
fi
|
||||
popd >/dev/null
|
||||
|
||||
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
"${cmd[@]}" $file* ${DEST_HARDENED}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
|
||||
fi
|
||||
popd >/dev/null
|
||||
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
||||
case ${spec} in
|
||||
stage3.spec)
|
||||
"${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
installcd-stage2-minimal.spec)
|
||||
"${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage4-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage3-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage4-nomultilib-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage3-x32.spec)
|
||||
"${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null || exit
|
||||
|
||||
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
||||
case ${spec} in
|
||||
hardened/stage3.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/admincd-stage2.spec)
|
||||
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage4-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage4-nomultilib-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-selinux.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/admincd-stage2-selinux.spec)
|
||||
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-selinux-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null || exit
|
||||
}
|
||||
|
||||
# vim:ft=sh:
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
|
|||
update_symlinks() {
|
||||
# Symlink the latest stages3 to build from
|
||||
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
|
||||
pushd $d >/dev/null
|
||||
pushd "${d}" >/dev/null || exit
|
||||
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
|
||||
# 20yymmddThhmmssZ
|
||||
# 20yymmddhhmmss
|
||||
|
|
@ -58,11 +58,13 @@ update_symlinks() {
|
|||
<<<"$f")
|
||||
ln -svf "$f" "$of"
|
||||
done
|
||||
popd >/dev/null
|
||||
popd >/dev/null || exit
|
||||
done
|
||||
}
|
||||
|
||||
post_build() {
|
||||
local set=$1 spec=$2
|
||||
|
||||
cmd=(
|
||||
rsync
|
||||
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
|
||||
|
|
@ -81,34 +83,58 @@ post_build() {
|
|||
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
|
||||
;;
|
||||
esac
|
||||
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
|
||||
mkdir -p ${TMPDIR}/empty
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
"${cmd[@]}" ${file}* ${DEST_DEFAULT}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
|
||||
fi
|
||||
popd >/dev/null
|
||||
|
||||
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
"${cmd[@]}" $file* ${DEST_HARDENED}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
|
||||
fi
|
||||
popd >/dev/null
|
||||
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
|
||||
case ${spec} in
|
||||
stage3.spec)
|
||||
"${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
installcd-stage2-minimal.spec)
|
||||
"${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage4-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage3-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage4-nomultilib-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
stage3-x32.spec)
|
||||
"${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null || exit
|
||||
|
||||
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
|
||||
case ${spec} in
|
||||
hardened/stage3.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/admincd-stage2.spec)
|
||||
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage4-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage4-nomultilib-minimal.spec)
|
||||
"${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-selinux.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/admincd-stage2-selinux.spec)
|
||||
"${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
|
||||
;;
|
||||
hardened/stage3-selinux-nomultilib.spec)
|
||||
"${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null || exit
|
||||
}
|
||||
|
||||
# vim:ft=sh:
|
||||
|
|
|
|||
Loading…
Reference in a new issue