[gentoo-commits] proj/releng:master commit in: tools/

[Matt Turner]

commit:     3d95cec60b1acde2f6561df4dcc26f4b0dffe86c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:01:29 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 00:01:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=3d95cec6

tools: Add UPLOAD_KEY

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 tools/catalyst-auto-alpha.conf      | 3 ++-
 tools/catalyst-auto-amd64.conf      | 3 ++-
 tools/catalyst-auto-arm.conf        | 3 ++-
 tools/catalyst-auto-arm64.conf      | 3 ++-
 tools/catalyst-auto-hppa.conf       | 3 ++-
 tools/catalyst-auto-ia64.conf       | 3 ++-
 tools/catalyst-auto-ppc.conf        | 3 ++-
 tools/catalyst-auto-ppc64le.conf    | 3 ++-
 tools/catalyst-auto-qemu-arm.conf   | 3 ++-
 tools/catalyst-auto-qemu-riscv.conf | 3 ++-
 tools/catalyst-auto-s390.conf       | 3 ++-
 tools/catalyst-auto-s390x.conf      | 3 ++-
 tools/catalyst-auto-sparc64.conf    | 3 ++-
 tools/catalyst-auto-x86.conf        | 3 ++-
 14 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 687d1fc3..a60f979d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
  
 UPLOAD_USER=alpha
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/alpha
  
 SPECS="stage1.spec stage3.spec"
@@ -34,7 +35,7 @@ update_symlinks() {
 
 upload() {
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3c0b6c99..16aeda56 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=amd64
+UPLOAD_KEY=/root/.ssh/id_rsa
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -67,7 +68,7 @@ update_symlinks() {
 upload() {
 	echo " ** Uploading $@"
 	rsync \
-	-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+	-e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
 	-a \
 	--omit-dir-times \
 	--delay-updates \

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index feaad6bd..56459c50 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_ed25519
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -56,7 +57,7 @@ update_symlinks() {
 upload() {
     if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     else
 	echo Would now upload "$@"
 	ls -l $@

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 14211166..064e6f41 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=arm64
+UPLOAD_KEY=/root/.ssh/id_ed25519
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -28,7 +29,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 135b188c..d2034010 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=hppa
+UPLOAD_KEY=/root/.ssh/buildsync.key
 SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
 SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@@ -34,7 +35,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 2b495a73..845ffc51 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=ia64
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 
 SPECS="stage1.spec stage3.spec"
@@ -27,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index be7a7fc3..8628f30f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
  
 UPLOAD_USER=ppc
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc
  
 SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
  
 post_build() {

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 5e1563b8..716e43fd 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
  
 UPLOAD_USER=ppc
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
 SPECS="stage1.spec stage3.spec"
@@ -34,7 +35,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 2d19a9b9..c351e99b 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_rsa
 
 host=$(hostname)
 
@@ -57,7 +58,7 @@ update_symlinks() {
 upload() {
     if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     else
 	echo Would now upload "$@"
 	ls -l $@

diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 572d9d22..14e2b561 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=riscv
+UPLOAD_KEY=/root/.ssh/id_rsa
 
 host=$(hostname)
 
@@ -44,7 +45,7 @@ update_symlinks() {
 upload() {
     if [[ ${nonetwork} == 0 ]]; then
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
     fi
 }
 

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index c8dbf832..8f59d581 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=s390
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -27,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c5a32dff..241179d5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=s390
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -27,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index cabf9293..fd963987 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=sparc
+UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs/sparc
 
 SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
@@ -29,7 +30,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+	rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
 }
 
 post_build() {

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1616e194..4753c3fe 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,6 +2,7 @@
 # self-explanatory.
 
 UPLOAD_USER=x86
+UPLOAD_KEY=/root/.ssh/id_rsa
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -54,7 +55,7 @@ update_symlinks() {
 upload() {
 	echo " ** Uploading $@"
 	rsync \
-	-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+	-e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
 	-a \
 	--omit-dir-times \
 	--delay-updates \