laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/simtrace2/+/30151 )

Change subject: contrib/jenkins.sh : build and publish combined targets
......................................................................

contrib/jenkins.sh : build and publish combined targets

This makes production a bit easier.

Related: OS#5722
Change-Id: I32f9a0213aaefa50232a3d8dc2e7a4f2f44dbae1
---
M contrib/jenkins.sh
1 file changed, 24 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 1c2e2ea..be6bda1 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -27,20 +27,37 @@
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"

-BUILDS=""
-BUILDS+="simtrace/dfu simtrace/blupdate simtrace/trace simtrace/cardem "
-BUILDS+="qmod/dfu qmod/blupdate qmod/cardem "
-BUILDS+="owhw/dfu owhw/blupdate owhw/cardem "
-BUILDS+="octsimtest/cardem "
-BUILDS+="ngff_cardem/dfu ngff_cardem/blupdate ngff_cardem/cardem 
ngff_cardem/trace "
+# dfu target MUST be built first, the combined targets need a bl that can be 
combined..
+BUILDS="simtrace/dfu qmod/dfu owhw/dfu ngff_cardem/dfu "
+#
+BUILDS+="simtrace/blupdate qmod/blupdate owhw/blupdate ngff_cardem/blupdate "
+BUILDS+="simtrace/cardem qmod/cardem owhw/cardem octsimtest/cardem 
ngff_cardem/cardem "
+BUILDS+="simtrace/trace ngff_cardem/trace "

 cd $TOPDIR/firmware
 for build in $BUILDS; do
        board=`echo $build | cut -d "/" -f 1`
        app=`echo $build | cut -d "/" -f 2`
+       case "$build" in
+               "owhw/cardem")
+                       comb="combined"
+                       ;;
+               "qmod/cardem")
+                       comb="combined"
+                       ;;
+               "ngff_cardem/cardem")
+                       comb="combined"
+                       ;;
+               "simtrace/trace")
+                       comb="combined"
+                       ;;
+               *)
+                       comb=""
+                       ;;
+       esac
        echo
        echo "=============== $board / $app START  =============="
-       PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" 
APP="$app"
+       PATH="/opt/llvm-arm/bin:$PATH" make USE_CLANG=1 BOARD="$board" 
APP="$app" $comb
        echo "=============== $board / $app RES:$? =============="
 done




2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted 
one.
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30151
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I32f9a0213aaefa50232a3d8dc2e7a4f2f44dbae1
Gerrit-Change-Number: 30151
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-MessageType: merged

Reply via email to