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 7E02C13835A for ; Mon, 1 Feb 2021 04:04:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADEFEE09CB; Mon, 1 Feb 2021 04:04:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7B4D4E09CB for ; Mon, 1 Feb 2021 04:04:52 +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 5AAEB340E97 for ; Mon, 1 Feb 2021 04:04:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41EA74B3 for ; Mon, 1 Feb 2021 04:04:48 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1612058232.7ec486fab44faf29fc8abbedf9449f64088a89de.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto tools/catalyst-auto-alpha.conf tools/catalyst-auto-amd64.conf tools/catalyst-auto-arm.conf tools/catalyst-auto-arm64.conf tools/catalyst-auto-hppa.conf tools/catalyst-auto-ia64.conf tools/catalyst-auto-ppc.conf tools/catalyst-auto-ppc64le.conf tools/catalyst-auto-qemu-arm.conf tools/catalyst-auto-qemu-riscv.conf tools/catalyst-auto-s390.conf tools/catalyst-auto-s390x.conf tools/catalyst-auto-sparc64.conf tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7ec486fab44faf29fc8abbedf9449f64088a89de X-VCS-Branch: master Date: Mon, 1 Feb 2021 04:04:48 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87716498-2c3d-467b-80de-c11b66f02cfe X-Archives-Hash: 1d1d96cba892754574b40b14b4d71bf3 commit: 7ec486fab44faf29fc8abbedf9449f64088a89de Author: Matt Turner gentoo org> AuthorDate: Sun Jan 31 01:02:35 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Jan 31 01:57:12 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7ec486fa tools: Consolidate upload() function Signed-off-by: Matt Turner gentoo.org> tools/catalyst-auto | 24 +++++++++++++++++++++++- tools/catalyst-auto-alpha.conf | 18 ------------------ tools/catalyst-auto-amd64.conf | 18 ------------------ tools/catalyst-auto-arm.conf | 23 ----------------------- tools/catalyst-auto-arm64.conf | 17 ----------------- tools/catalyst-auto-hppa.conf | 17 ----------------- tools/catalyst-auto-ia64.conf | 17 ----------------- tools/catalyst-auto-ppc.conf | 17 ----------------- tools/catalyst-auto-ppc64le.conf | 17 ----------------- tools/catalyst-auto-qemu-arm.conf | 23 ----------------------- tools/catalyst-auto-qemu-riscv.conf | 20 -------------------- tools/catalyst-auto-s390.conf | 17 ----------------- tools/catalyst-auto-s390x.conf | 17 ----------------- tools/catalyst-auto-sparc64.conf | 17 ----------------- tools/catalyst-auto-x86.conf | 18 ------------------ 15 files changed, 23 insertions(+), 257 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 203abe81..0f0eae34 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -47,7 +47,6 @@ Options: --interval Exit if last successful run was less than ago -l|--lock File to grab a lock on to prevent multiple invocations -X|--nonetwork Do not perform network operations (like uploading result) - This needs to be supported by the config file as well. -h|--help Show this message and quit EOH @@ -270,6 +269,29 @@ verify_dnssec() { fi } +upload() { + if [[ ${nonetwork} == 0 ]]; then + echo Uploading "$@" + local SSH_CMD=( + ssh + -i ${UPLOAD_KEY} + -o UserKnownHostsFile=/dev/null + -o VerifyHostKeyDNS=yes + -o StrictHostKeyChecking=no + ) + local RSYNC_OPTS=( + -e "${SSH_CMD[*]}" + --archive + --omit-dir-times + --delay-updates + ) + rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} + else + echo Would now upload "$@" + ls -l $@ + fi +} + run_catalyst_commands() { doneconfig=0 for config_file in "${config_files[@]}"; do diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf index c2359f59..f755c9b5 100644 --- a/tools/catalyst-auto-alpha.conf +++ b/tools/catalyst-auto-alpha.conf @@ -33,24 +33,6 @@ update_symlinks() { done } -upload() { - echo Uploading "$@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 0b07c988..b14013f7 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -65,24 +65,6 @@ update_symlinks() { done } -upload() { - echo " ** Uploading $@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index b15d3569..829ff4c5 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -54,29 +54,6 @@ update_symlinks() { done } -upload() { - if [[ ${nonetwork} == 0 ]]; then - echo Uploading "$@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} - else - echo Would now upload "$@" - ls -l $@ - fi -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index c14cb56b..5346153f 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -28,23 +28,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf index d93a1370..8ad8f767 100644 --- a/tools/catalyst-auto-hppa.conf +++ b/tools/catalyst-auto-hppa.conf @@ -34,23 +34,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 852be0d4..009d5fd9 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -27,23 +27,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf index 68f49290..3a81822e 100644 --- a/tools/catalyst-auto-ppc.conf +++ b/tools/catalyst-auto-ppc.conf @@ -32,23 +32,6 @@ update_symlinks() { popd >/dev/null done } - -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf index ecd4a738..a93975ca 100644 --- a/tools/catalyst-auto-ppc64le.conf +++ b/tools/catalyst-auto-ppc64le.conf @@ -34,23 +34,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf index 68b51a2d..0e2d7826 100644 --- a/tools/catalyst-auto-qemu-arm.conf +++ b/tools/catalyst-auto-qemu-arm.conf @@ -55,29 +55,6 @@ update_symlinks() { done } -upload() { - if [[ ${nonetwork} == 0 ]]; then - echo Uploading "$@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} - else - echo Would now upload "$@" - ls -l $@ - fi -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf index ce73642b..e809b598 100644 --- a/tools/catalyst-auto-qemu-riscv.conf +++ b/tools/catalyst-auto-qemu-riscv.conf @@ -42,26 +42,6 @@ update_symlinks() { done } -upload() { - if [[ ${nonetwork} == 0 ]]; then - echo Uploading "$@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} - fi -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 11bdf6cc..15b5382b 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -27,23 +27,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index 1a5ea91d..5a351358 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -27,23 +27,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf index 77dd62ee..668971db 100644 --- a/tools/catalyst-auto-sparc64.conf +++ b/tools/catalyst-auto-sparc64.conf @@ -29,23 +29,6 @@ update_symlinks() { done } -upload() { - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index bb779d7e..5822d992 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -52,24 +52,6 @@ update_symlinks() { done } -upload() { - echo " ** Uploading $@" - local SSH_CMD=( - ssh - -i ${UPLOAD_KEY} - -o UserKnownHostsFile=/dev/null - -o VerifyHostKeyDNS=yes - -o StrictHostKeyChecking=no - ) - local RSYNC_OPTS=( - -e "${SSH_CMD[*]}" - --archive - --omit-dir-times - --delay-updates - ) - rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST} -} - post_build() { local set=$1 spec=$2