osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 ) Change subject: contrib/jenkins.sh: Build e1-tracer host software ...................................................................... contrib/jenkins.sh: Build e1-tracer host software Run the different job types based on a new environment variable, as the software has to be built with a different docker image. The related osmo-ci patch adjusts the jenkins jobs accordingly. Co-developed-by: Oliver Smith &lt;osmith(a)sysmocom.de&gt; Related: osmo-ci I90fbe72c722e491f41b9607d1a6389964d7e43b4 Change-Id: I26e839de419c6eb86bf2a6250a1adf06b761d1fa --- M contrib/jenkins.sh 1 file changed, 66 insertions(+), 53 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 79d6571..b2f49f5 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -2,70 +2,43 @@ # jenkins build helper script for osmo-e1-hardware. This is how we build on jenkins.osmocom.org # # environment variables: -# * WITH_MANUALS: build manual PDFs if set to "1" # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") - -if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then - echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" - exit 2 -fi +# * JOB_TYPE: one of "firmware", "gateware", "manuals", "software" +# +# We assume that PATH includes the path to the respective toolchain. +# The argument '--publish' is used to trigger publication/upload of firmware. set -e TOPDIR=`pwd` publish="$1" -base="$PWD" -deps="$base/deps" -inst="$deps/install" -export deps inst - -export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" -export LD_LIBRARY_PATH="$inst/lib" -export PATH="$inst/bin:$PATH" - -osmo-clean-workspace.sh - -mkdir "$deps" || true - -# we assume that PATH includes the path to the respective toolchain - -# firmware build -FW_DIRS="firmware/ice40-riscv/e1-tracer firmware/ice40-riscv/icE1usb" -for d in $FW_DIRS; do - echo - echo "=============== $d FIRMWARE ==============" - make -C $d clean all -done - -# The argument '--publish' is used to trigger publication/upload of firmware -if [ "x$publish" = "x--publish" ]; then - - echo - echo "=============== UPLOAD FIRMWARE ==============" - - cat > "/build/known_hosts" <<EOF +cat > "/build/known_hosts" <<EOF [ftp.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9 [ftp.osmocom.org]:48 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdWn1kEousXuKsZ+qJEZTt/NSeASxCrUfNDW3LWtH+d8Ust7ZuKp/vuyG+5pe5pwpPOgFu7TjN+0lVjYJVXH54= [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/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/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 -# manuals build + optional publication -if [ "$WITH_MANUALS" = "1" ]; then - make -C doc/manuals clean all - if [ "$PUBLISH" = "1" ]; then - make -C doc/manuals publish +case "$JOB_TYPE" in +"firmware") + FW_DIRS="firmware/ice40-riscv/e1-tracer firmware/ice40-riscv/icE1usb" + for d in $FW_DIRS; do + echo + echo "=============== $d FIRMWARE ==============" + make -C $d clean all + done + + if [ "x$publish" = "x--publish" ]; then + echo + echo "=============== UPLOAD FIRMWARE ==============" + SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" + 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/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 -fi - -# gateware build -if [ "$WITH_GATEWARE" = "1" ]; then + ;; +"gateware") GATE_VARS="IGNORE_TIMING=1 SINGLE_CHANNEL=1" GATE_DIRS="gateware/e1-tracer gateware/icE1usb" for d in $GATE_DIRS; do @@ -74,6 +47,46 @@ make -C $d clean make -C $d ${GATE_VARS} done -fi + ;; +"manuals") + make -C doc/manuals clean all -osmo-clean-workspace.sh + if [ "$PUBLISH" = "1" ]; then + make -C doc/manuals publish + fi + ;; +"software") + if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 + fi + + base="$PWD" + deps="$base/deps" + inst="$deps/install" + export deps inst + + export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" + export LD_LIBRARY_PATH="$inst/lib" + export PATH="$inst/bin:$PATH" + + osmo-clean-workspace.sh + + mkdir -p "$deps" + + osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false + osmo-build-dep.sh libosmo-abis + + SW_DIRS="software/e1-tracer/record software/e1-tracer/analyze" + for d in $SW_DIRS; do + echo + echo "=============== $d SOFTWARE ==============" + make -C $d clean all + done + + osmo-clean-workspace.sh + ;; +*) + echo "ERROR: unsupported value for JOB_TYPE: $JOB_TYPE" + exit 1 +esac -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/29921 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: I26e839de419c6eb86bf2a6250a1adf06b761d1fa Gerrit-Change-Number: 29921 Gerrit-PatchSet: 7 Gerrit-Owner: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel &lt;dwillmann(a)sysmocom.de&gt; Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged