lynxis lazus submitted this change.

View Change

Approvals: lynxis lazus: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve
contrib/jenkins.sh: pin libosmocore to the last release

Ensure the libosmocore version doesn't move while building
firmwares which are published.
This improve reproducible builds.

Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c
---
M contrib/jenkins.sh
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e53a450..deaeea5 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,6 +1,11 @@
#!/bin/bash

TOPDIR=`pwd`
+# empty env LIBOSMOCORE_COMMIT means master, default for release to 1.14.1
+# Having a known commit for libosmocore allow more reproducible builds of the published firmwares
+if [ "$publish" = "--publish" ] && [ -z "$LIBOSMOCORE_COMMIT" ]; then
+ LIBOSMOCORE_COMMIT="1.14.1"
+fi

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 !"
@@ -19,7 +24,7 @@

mkdir "$deps" || true

-osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
+osmo-build-dep.sh libosmocore "$LIBOSMOCORE_COMMIT" '--disable-doxygen --enable-gnutls'

# verify only after building the dependency (to ensure we have most recent source of dependency)
verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")

To view, visit change 43281. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c
Gerrit-Change-Number: 43281
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>