tools/catalyst-auto-{x86,amd64}: refactor post_build for remote buildhost.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
parent
bcdd88a2d4
commit
0292a7e2b5
2 changed files with 44 additions and 16 deletions
|
@ -84,31 +84,43 @@ pre_build() {
|
|||
}
|
||||
|
||||
post_build() {
|
||||
cmd=(
|
||||
rsync
|
||||
-e 'ssh -i /root/.ssh/id_rsa'
|
||||
-a
|
||||
--omit-dir-times
|
||||
--delay-updates
|
||||
)
|
||||
case $HOSTNAME in
|
||||
nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
|
||||
*) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
|
||||
esac
|
||||
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
|
||||
mkdir -p ${BUILD_DESTDIR_BASE}
|
||||
mkdir -p ${TMPDIR}/empty
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
cp $file* ${BUILD_DESTDIR_BASE}
|
||||
"${cmd[@]}" ${file}* ${DEST}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
|
||||
fi
|
||||
popd >/dev/null
|
||||
|
||||
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
|
||||
mkdir -p ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
cp $file* ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" $file* ${DEST}/hardened
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -55,27 +55,43 @@ pre_build() {
|
|||
}
|
||||
|
||||
post_build() {
|
||||
cmd=(
|
||||
rsync
|
||||
-e 'ssh -i /root/.ssh/id_rsa'
|
||||
-a
|
||||
--omit-dir-times
|
||||
--delay-updates
|
||||
)
|
||||
case $HOSTNAME in
|
||||
nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
|
||||
*) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
|
||||
esac
|
||||
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
|
||||
mkdir -p ${BUILD_DESTDIR_BASE}
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
|
||||
mkdir -p ${TMPDIR}/empty
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST}
|
||||
for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
cp $file* ${BUILD_DESTDIR_BASE}
|
||||
"${cmd[@]}" ${file}* ${DEST}
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
|
||||
fi
|
||||
popd >/dev/null
|
||||
|
||||
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
|
||||
mkdir -p ${BUILD_DESTDIR_BASE}/hardened
|
||||
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
|
||||
"${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
|
||||
for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
|
||||
if [ -f $file ]; then
|
||||
cp $file* ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" $file* ${DEST}/hardened
|
||||
fi
|
||||
done
|
||||
if [ -f *${DATESTAMP}*.iso ]; then
|
||||
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
|
||||
"${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
|
||||
elif [ -f *${TIMESTAMP}*.iso ]; then
|
||||
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue