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

[Matt Turner]

commit:     5515e890485b5f23a68104dc7004235a02dca15d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:43:40 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 23:46:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=5515e890

tools: Add UPLOAD_USER variable

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

 tools/catalyst-auto-alpha.conf      | 3 ++-
 tools/catalyst-auto-amd64.conf      | 6 +++---
 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   | 4 +++-
 tools/catalyst-auto-qemu-riscv.conf | 4 +++-
 tools/catalyst-auto-s390.conf       | 3 ++-
 tools/catalyst-auto-s390x.conf      | 3 ++-
 tools/catalyst-auto-sparc64.conf    | 3 ++-
 tools/catalyst-auto-x86.conf        | 6 +++---
 14 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 27825851..687d1fc3 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
+UPLOAD_USER=alpha
 SPECS_DIR=${REPO_DIR}/releases/specs/alpha
  
 SPECS="stage1.spec stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
 
 upload() {
 	echo Uploading "$@"
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 6ee56fb1..3c0b6c99 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-ARCH="amd64"
+UPLOAD_USER=amd64
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -85,8 +85,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac
 

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 9f873c31..feaad6bd 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=arm
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -55,7 +56,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' "$@" arm@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_ed25519 -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 e143ebbb..14211166 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=arm64
 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -27,7 +28,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm64@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_ed25519 -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 967985b6..135b188c 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=hppa
 SPECS_DIR=${REPO_DIR}/releases/specs/hppa
 
 SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@@ -33,7 +34,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" hppa@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/buildsync.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 0bc6e0af..2b495a73 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=ia64
 SPECS_DIR=${REPO_DIR}/releases/specs/ia64
 
 SPECS="stage1.spec stage3.spec"
@@ -26,7 +27,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ia64@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 4935739a..be7a7fc3 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
+UPLOAD_USER=ppc
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc
  
 SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
@@ -32,7 +33,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 73f2d1c3..5e1563b8 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
  
+UPLOAD_USER=ppc
 SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
 
 SPECS="stage1.spec 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' "$@" ppc@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 a6d9cdd8..2d19a9b9 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -1,6 +1,8 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=arm
+
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
@@ -55,7 +57,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' "$@" arm@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 89c40b79..572d9d22 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -1,6 +1,8 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=riscv
+
 host=$(hostname)
 
 SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
@@ -42,7 +44,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' "$@" riscv@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 ed84923a..c8dbf832 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=s390
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -26,7 +27,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 8bdb8993..c5a32dff 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=s390
 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
 SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
 
@@ -26,7 +27,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 94723124..cabf9293 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,6 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
+UPLOAD_USER=sparc
 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"
@@ -28,7 +29,7 @@ update_symlinks() {
 }
 
 upload() {
-	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" sparc@××××××××××××××××××××××.org:
+	rsync -e 'ssh -i /root/.ssh/id_rsa -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 e28131fc..1616e194 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -1,7 +1,7 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-ARCH="x86"
+UPLOAD_USER=x86
 host=$(hostname)
 
 source /etc/catalyst/release/build.env
@@ -72,8 +72,8 @@ post_build() {
 			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
 			;;
 		*)
-			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+			DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+			DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
 			;;
 	esac