chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools: Add UPLOAD_USER variable

Browse source 
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2021-01-30 18:43:40 -05:00
parent 16b0dfbc2e
commit 5515e89048
14 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/catalyst-auto-alpha.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=alpha
SPECS_DIR=${REPO_DIR}/releases/specs/alpha SPECS_DIR=${REPO_DIR}/releases/specs/alpha
SPECS="stage1.spec stage3.spec" SPECS="stage1.spec stage3.spec"
@ -33,7 +34,7 @@ update_symlinks() {
upload() { upload() {
echo Uploading "$@" echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.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() { post_build() {

6
tools/catalyst-auto-amd64.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
ARCH="amd64" UPLOAD_USER=amd64
host=$(hostname) host=$(hostname)
source /etc/catalyst/release/build.env source /etc/catalyst/release/build.env
@ -85,8 +85,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;; ;;
*) *)
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE} DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;; ;;
esac esac

3
tools/catalyst-auto-arm.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm
host=$(hostname) host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs/arm SPECS_DIR=${REPO_DIR}/releases/specs/arm
@ -55,7 +56,7 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

3
tools/catalyst-auto-arm64.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm64
SPECS_DIR=${REPO_DIR}/releases/specs/arm64 SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@ -27,7 +28,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm64@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-hppa.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=hppa
SPECS_DIR=${REPO_DIR}/releases/specs/hppa SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot" SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@ -33,7 +34,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" hppa@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-ia64.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=ia64
SPECS_DIR=${REPO_DIR}/releases/specs/ia64 SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SPECS="stage1.spec stage3.spec" SPECS="stage1.spec stage3.spec"
@ -26,7 +27,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ia64@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-ppc.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=ppc
SPECS_DIR=${REPO_DIR}/releases/specs/ppc SPECS_DIR=${REPO_DIR}/releases/specs/ppc
SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec" SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
@ -32,7 +33,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-ppc64le.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=ppc
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec" SPECS="stage1.spec stage3.spec"
@ -33,7 +34,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.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() { post_build() {

4
tools/catalyst-auto-qemu-arm.conf
View file

@ -1,6 +1,8 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm
host=$(hostname) host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
@ -55,7 +57,7 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

4
tools/catalyst-auto-qemu-riscv.conf
View file

@ -1,6 +1,8 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=riscv
host=$(hostname) host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
@ -42,7 +44,7 @@ update_symlinks() {
upload() { upload() {
if [[ ${nonetwork} == 0 ]]; then if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@" echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" riscv@releng-incoming.gentoo.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 fi
} }

3
tools/catalyst-auto-s390.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=s390
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390 SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@ -26,7 +27,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-s390x.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=s390
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'` SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@ -26,7 +27,7 @@ update_symlinks() {
} }
upload() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.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() { post_build() {

3
tools/catalyst-auto-sparc64.conf
View file

@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
UPLOAD_USER=sparc
SPECS_DIR=${REPO_DIR}/releases/specs/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" 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() { upload() {
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" sparc@releng-incoming.gentoo.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() { post_build() {

6
tools/catalyst-auto-x86.conf
View file

@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty # This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory. # self-explanatory.
ARCH="x86" UPLOAD_USER=x86
host=$(hostname) host=$(hostname)
source /etc/catalyst/release/build.env source /etc/catalyst/release/build.env
@ -72,8 +72,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;; ;;
*) *)
DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE} DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;; ;;
esac esac