chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/catalyst-auto-{x86,amd64}: refactor post_build for remote buildhost.

Browse source 
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Robin H. Johnson 2017-12-14 21:48:20 -08:00
parent bcdd88a2d4
commit 0292a7e2b5
No known key found for this signature in database
GPG key ID: 19395F23C58826C4
2 changed files with 44 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/catalyst-auto-amd64.conf
View file

@ -84,31 +84,43 @@ pre_build() {
} }
post_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 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 for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then if [ -f $file ]; then
cp $file* ${BUILD_DESTDIR_BASE} "${cmd[@]}" ${file}* ${DEST}
fi fi
done done
if [ -f *${DATESTAMP}*.iso ]; then if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE} "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
elif [ -f *${TIMESTAMP}*.iso ]; then elif [ -f *${TIMESTAMP}*.iso ]; then
cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE} "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
fi fi
popd >/dev/null popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/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 for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then if [ -f $file ]; then
cp $file* ${BUILD_DESTDIR_BASE}/hardened "${cmd[@]}" $file* ${DEST}/hardened
fi fi
done done
if [ -f *${DATESTAMP}*.iso ]; then if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
elif [ -f *${TIMESTAMP}*.iso ]; then elif [ -f *${TIMESTAMP}*.iso ]; then
cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
fi fi
} }

32
tools/catalyst-auto-x86.conf
View file

@ -55,27 +55,43 @@ pre_build() {
} }
post_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 pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE} mkdir -p ${TMPDIR}/empty
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do "${cmd[@]}" ${TMPDIR}/empty ${DEST}
for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then if [ -f $file ]; then
cp $file* ${BUILD_DESTDIR_BASE} "${cmd[@]}" ${file}* ${DEST}
fi fi
done done
if [ -f *${DATESTAMP}*.iso ]; then 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 fi
popd >/dev/null popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/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} ); do for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then if [ -f $file ]; then
cp $file* ${BUILD_DESTDIR_BASE}/hardened "${cmd[@]}" $file* ${DEST}/hardened
fi fi
done done
if [ -f *${DATESTAMP}*.iso ]; then 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 fi
} }