From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCC5C138206 for ; Tue, 16 Jan 2018 16:21:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CD04E086D; Tue, 16 Jan 2018 16:21:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C0A1E086D for ; Tue, 16 Jan 2018 16:21:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7077B335C5D for ; Tue, 16 Jan 2018 16:21:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA5251BC for ; Tue, 16 Jan 2018 16:21:17 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1516086079.40ed3e84d7ed3f8afce986344d1b88c8309f4d81.vapier@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-alpha.conf tools/catalyst-auto-arm64.conf tools/catalyst-auto-hppa.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-ppc.conf tools/catalyst-auto-ppc64.conf tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf X-VCS-Directories: tools/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 40ed3e84d7ed3f8afce986344d1b88c8309f4d81 X-VCS-Branch: master Date: Tue, 16 Jan 2018 16:21:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11de2703-6e33-4245-9473-d7d2fb8ca633 X-Archives-Hash: d1017b3c46fc24e3849f987ae44895ed commit: 40ed3e84d7ed3f8afce986344d1b88c8309f4d81 Author: Mike Frysinger gentoo org> AuthorDate: Tue Jan 16 07:01:19 2018 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 16 07:01:19 2018 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40ed3e84 catalyst-auto: update arch configs after timestamp changes Commit ed258c751bb3457721112e2371d426c112369331 (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. tools/catalyst-auto-alpha.conf | 33 ++++++++++++++++++----------- tools/catalyst-auto-arm64.conf | 31 ++++++++++++++++++---------- tools/catalyst-auto-hppa.conf | 47 +++++++++++++++++++++++++----------------- tools/catalyst-auto-ia64.conf | 33 ++++++++++++++++++----------- tools/catalyst-auto-ppc.conf | 31 ++++++++++++++++++---------- tools/catalyst-auto-ppc64.conf | 37 ++++++++++++++++++++------------- tools/catalyst-auto-s390.conf | 37 ++++++++++++++++++++------------- tools/catalyst-auto-s390x.conf | 37 ++++++++++++++++++++------------- 8 files changed, 179 insertions(+), 107 deletions(-) diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index 585f8f23..5a86db14 100644 --- a/tools/catalyst-auto-alpha.conf +++ b/tools/catalyst-auto-alpha.conf @@ -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 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 21617af7..c1320a96 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -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 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index b7b41527..14e604ca 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -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 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index ac8eee77..950a9b48 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -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 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 05a10ec6..49a3dd95 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -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 diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf index dbe0c767..3ca55464 100644 --- a/tools/catalyst-auto-ppc64.conf +++ b/tools/catalyst-auto-ppc64.conf @@ -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 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 560a38d3..36672db2 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -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 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index a01b9a81..2aa01f7a 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -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