tools: Add UPLOAD_KEY

Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
Matt Turner 2021-01-30 19:01:29 -05:00
parent 5515e89048
commit 3d95cec60b
14 changed files with 28 additions and 14 deletions

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=alpha UPLOAD_USER=alpha
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/alpha SPECS_DIR=${REPO_DIR}/releases/specs/alpha
SPECS="stage1.spec stage3.spec" SPECS="stage1.spec stage3.spec"
@ -34,7 +35,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' "$@" ${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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=amd64 UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname) host=$(hostname)
source /etc/catalyst/release/build.env source /etc/catalyst/release/build.env
@ -67,7 +68,7 @@ update_symlinks() {
upload() { upload() {
echo " ** Uploading $@" echo " ** Uploading $@"
rsync \ 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 \ -a \
--omit-dir-times \ --omit-dir-times \
--delay-updates \ --delay-updates \

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm UPLOAD_USER=arm
UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname) host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs/arm SPECS_DIR=${REPO_DIR}/releases/specs/arm
@ -56,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_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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm64 UPLOAD_USER=arm64
UPLOAD_KEY=/root/.ssh/id_ed25519
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}'`
@ -28,7 +29,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=hppa UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/buildsync.key
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"
@ -34,7 +35,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=ia64 UPLOAD_USER=ia64
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64 SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SPECS="stage1.spec stage3.spec" SPECS="stage1.spec stage3.spec"
@ -27,7 +28,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=ppc UPLOAD_USER=ppc
UPLOAD_KEY=/root/.ssh/id_rsa
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"
@ -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' "$@" ${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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=ppc UPLOAD_USER=ppc
UPLOAD_KEY=/root/.ssh/id_rsa
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"
@ -34,7 +35,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=arm UPLOAD_USER=arm
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname) host=$(hostname)
@ -57,7 +58,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' "$@" ${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 else
echo Would now upload "$@" echo Would now upload "$@"
ls -l $@ ls -l $@

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=riscv UPLOAD_USER=riscv
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname) host=$(hostname)
@ -44,7 +45,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' "$@" ${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 fi
} }

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=s390 UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
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}'`
@ -27,7 +28,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=s390 UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
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}'`
@ -27,7 +28,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=sparc UPLOAD_USER=sparc
UPLOAD_KEY=/root/.ssh/id_rsa
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"
@ -29,7 +30,7 @@ update_symlinks() {
} }
upload() { 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() { post_build() {

View file

@ -2,6 +2,7 @@
# self-explanatory. # self-explanatory.
UPLOAD_USER=x86 UPLOAD_USER=x86
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname) host=$(hostname)
source /etc/catalyst/release/build.env source /etc/catalyst/release/build.env
@ -54,7 +55,7 @@ update_symlinks() {
upload() { upload() {
echo " ** Uploading $@" echo " ** Uploading $@"
rsync \ 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 \ -a \
--omit-dir-times \ --omit-dir-times \
--delay-updates \ --delay-updates \