Change in osmo-e1-hardware[master]: jenkins.sh: Fix upload of tagged releases
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 ) Change subject: jenkins.sh: Fix upload of tagged releases ...................................................................... jenkins.sh: Fix upload of tagged releases Tagged releases get something like icE1usb-fw-0.2.elf without a git-hash component suffix. So the old glob *-*-*-*.{bin,elf} was not matching and we got errors like rsync: link_stat "/build/firmware/ice40-riscv/icE1usb/*-*-*-*.bin" failed: No such file or directory (2) rsync: link_stat "/build/firmware/ice40-riscv/icE1usb/*-*-*-*.elf" failed: No such file or directory (2) Change-Id: I7509f9d92ec19c1702af5f958d495e21321053bc --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/22/26922/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9352a47..79d6571 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -50,9 +50,9 @@ [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/*-*-*-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ rsync --archive --copy-links --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/latest/ - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/*-*-*-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ rsync --verbose --copy-links --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/latest/ fi -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7509f9d92ec19c1702af5f958d495e21321053bc Gerrit-Change-Number: 26922 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-MessageType: newchange
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 ) Change subject: jenkins.sh: Fix upload of tagged releases ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7509f9d92ec19c1702af5f958d495e21321053bc Gerrit-Change-Number: 26922 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Comment-Date: Sun, 16 Jan 2022 17:14:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 ) Change subject: jenkins.sh: Fix upload of tagged releases ...................................................................... jenkins.sh: Fix upload of tagged releases Tagged releases get something like icE1usb-fw-0.2.elf without a git-hash component suffix. So the old glob *-*-*-*.{bin,elf} was not matching and we got errors like rsync: link_stat "/build/firmware/ice40-riscv/icE1usb/*-*-*-*.bin" failed: No such file or directory (2) rsync: link_stat "/build/firmware/ice40-riscv/icE1usb/*-*-*-*.elf" failed: No such file or directory (2) Change-Id: I7509f9d92ec19c1702af5f958d495e21321053bc --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9352a47..79d6571 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -50,9 +50,9 @@ [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/*-*-*-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/all/ rsync --archive --copy-links --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/icE1usb/icE1usb-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/icE1usb/firmware/latest/ - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/*-*-*-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw-*.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/all/ rsync --verbose --copy-links --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/ice40-riscv/e1-tracer/e1_tracer-fw.{bin,elf} binaries@ftp.osmocom.org:web-files/e1-tracer/firmware/latest/ fi -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I7509f9d92ec19c1702af5f958d495e21321053bc Gerrit-Change-Number: 26922 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge@osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-MessageType: merged
participants (1)
-
laforge