catalyst-auto: update arch configs after timestamp changes

Commit ed258c751b (change
datestamp->timestamp) broke a lot of builders.  The symlinks
and upload logic were all based on the datestamp.  Update it
to use the new timestamp format.
This commit is contained in:
Mike Frysinger 2018-01-16 02:01:19 -05:00
parent bbca329576
commit 40ed3e84d7
8 changed files with 179 additions and 107 deletions

View file

@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -46,10 +55,10 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
upload *-${DATESTAMP}*.iso*
upload *-${TIMESTAMP}*.iso*
;;
stage3.spec)
upload stage3-*${DATESTAMP}*.bz2*
upload stage3-*${TIMESTAMP}*.bz2*
;;
esac

View file

@ -25,17 +25,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -49,7 +58,7 @@ post_build() {
case ${spec} in
stage3.spec)
upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac

View file

@ -27,19 +27,28 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for t in hppa1.1 hppa2.0; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f t
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
done
popd >/dev/null
done
}
upload() {
@ -53,21 +62,21 @@ post_build() {
case ${spec} in
netboot2-hppa32.spec)
mv netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
upload netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
mv netboot2-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
upload netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
;;
netboot2-hppa64.spec)
mv netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
upload netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
mv netboot2-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
upload netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
;;
installcd-stage2-minimal.spec)
upload install-hppa-minimal-*${DATESTAMP}*.iso*
upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;;
hppa1.1/stage3.spec)
upload stage3-hppa1.1-*${DATESTAMP}*.bz2*
upload stage3-hppa1.1-*${TIMESTAMP}*.bz2*
;;
hppa2.0/stage3.spec)
upload stage3-hppa2.0-*${DATESTAMP}*.bz2*
upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
;;
esac

View file

@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -46,10 +55,10 @@ post_build() {
case ${spec} in
installcd-stage2*)
upload *${DATESTAMP}*.iso*
upload *${TIMESTAMP}*.iso*
;;
stage3.spec)
upload stage3-*${DATESTAMP}*.bz2*
upload stage3-*${TIMESTAMP}*.bz2*
;;
esac

View file

@ -24,17 +24,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -48,7 +57,7 @@ post_build() {
case ${spec} in
stage3.spec)
upload stage3-ppc-*${DATESTAMP}*.bz2*
upload stage3-ppc-*${TIMESTAMP}*.bz2*
;;
esac

View file

@ -25,19 +25,28 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for t in ppc64-64ul ppc64-32ul; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f t
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for t in ppc64-64ul ppc64-32ul; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
done
popd >/dev/null
done
}
upload() {
@ -51,10 +60,10 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
upload *${DATESTAMP}*.iso*
upload *${TIMESTAMP}*.iso*
;;
stage3*.spec)
upload stage3-ppc64-*${DATESTAMP}*.bz2*
upload stage3-ppc64-*${TIMESTAMP}*.bz2*
;;
esac

View file

@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -46,12 +55,12 @@ post_build() {
case ${spec} in
netboot/netboot.spec)
mv netboot2-s390-${DATESTAMP}/kernels/netboot netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
mv netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
upload netboot2-s390-${DATESTAMP}/netboot*
mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
upload netboot2-s390-${TIMESTAMP}/netboot*
;;
stage3.spec)
upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac

View file

@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
# stage3-xxx-2018.0.tar.bz2
# stage3-xxx-20180116.tar.bz2
# stage3-xxx-20180116T015819Z.tar.bz2
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
popd >/dev/null
done
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
@ -46,12 +55,12 @@ post_build() {
case ${spec} in
netboot/netboot.spec)
mv netboot2-s390x-${DATESTAMP}/kernels/netboot64 netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
mv netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
upload netboot2-s390x-${DATESTAMP}/netboot*
mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot2-s390x-${TIMESTAMP}/netboot*
;;
stage3.spec)
upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac