Move common steps into common jenkins helper
Move value_string termination check and OpenBSC headers checkout into shared jenkins helper from BTS' model-specific helpers to get rid of copy-pasted code. While at it - also remove unnecessary bash dependency. Change-Id: Ic48b1f75179b9008d65219dd5a47c1ab3b886408
This commit is contained in:
parent
d5971d0681
commit
5b87144f91
|
@ -1,22 +1,13 @@
|
||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
set -ex
|
# shellcheck source=contrib/jenkins_common.sh
|
||||||
|
. $(dirname "$0")/jenkins_common.sh
|
||||||
base="$PWD"
|
|
||||||
deps="$base/deps"
|
|
||||||
inst="$deps/install"
|
|
||||||
export deps inst
|
|
||||||
|
|
||||||
mkdir "$deps" || true
|
|
||||||
rm -rf "$inst"
|
|
||||||
|
|
||||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
export LD_LIBRARY_PATH="$inst/lib"
|
export LD_LIBRARY_PATH="$inst/lib"
|
||||||
|
|
||||||
osmo-build-dep.sh libosmocore
|
osmo-build-dep.sh libosmocore
|
||||||
|
|
||||||
"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
|
||||||
|
|
||||||
osmo-build-dep.sh libosmo-abis
|
osmo-build-dep.sh libosmo-abis
|
||||||
|
|
||||||
cd "$deps"
|
cd "$deps"
|
||||||
|
@ -24,9 +15,6 @@ cd "$deps"
|
||||||
# Get osmo-pcu for pcuif_proto.h
|
# Get osmo-pcu for pcuif_proto.h
|
||||||
osmo-deps.sh osmo-pcu
|
osmo-deps.sh osmo-pcu
|
||||||
|
|
||||||
# Get openbsc for gsm_data_shared.*
|
|
||||||
osmo-deps.sh openbsc
|
|
||||||
|
|
||||||
cd "$base"
|
cd "$base"
|
||||||
|
|
||||||
set +x
|
set +x
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
|
||||||
|
base="$PWD"
|
||||||
|
deps="$base/deps"
|
||||||
|
inst="$deps/install"
|
||||||
|
|
||||||
|
export deps inst
|
||||||
|
|
||||||
|
mkdir -p "$deps"
|
||||||
|
rm -rf "$inst"
|
||||||
|
|
||||||
|
cd "$deps"
|
||||||
|
|
||||||
|
# Get libosmocore for verify_value_string_arrays_are_terminated.py
|
||||||
|
osmo-deps.sh libosmocore
|
||||||
|
|
||||||
|
# Get OpenBSC for gsm_data_shared.*
|
||||||
|
osmo-deps.sh openbsc
|
||||||
|
|
||||||
|
cd "$base"
|
||||||
|
|
||||||
|
"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
|
@ -1,26 +1,10 @@
|
||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
set -ex
|
# shellcheck source=contrib/jenkins_common.sh
|
||||||
|
. $(dirname "$0")/jenkins_common.sh
|
||||||
base="$PWD"
|
|
||||||
deps="$base/deps"
|
|
||||||
inst="$deps/install"
|
|
||||||
export deps inst
|
|
||||||
|
|
||||||
mkdir "$deps" || true
|
|
||||||
rm -rf "$inst"
|
|
||||||
|
|
||||||
# Get the headers..
|
|
||||||
cd "$deps"
|
|
||||||
git clone git://git.osmocom.org/openbsc || true
|
|
||||||
cd openbsc
|
|
||||||
git pull --rebase
|
|
||||||
cd "$base"
|
|
||||||
|
|
||||||
osmo-build-dep.sh libosmocore
|
osmo-build-dep.sh libosmocore
|
||||||
|
|
||||||
"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
|
||||||
|
|
||||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
export LD_LIBRARY_PATH="$inst/lib"
|
export LD_LIBRARY_PATH="$inst/lib"
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,13 @@
|
||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
set -ex
|
# shellcheck source=contrib/jenkins_common.sh
|
||||||
|
. $(dirname "$0")/jenkins_common.sh
|
||||||
base="$PWD"
|
|
||||||
deps="$base/deps"
|
|
||||||
inst="$deps/install"
|
|
||||||
export deps inst
|
|
||||||
|
|
||||||
mkdir "$deps" || true
|
|
||||||
rm -rf "$inst"
|
|
||||||
|
|
||||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
export LD_LIBRARY_PATH="$inst/lib"
|
export LD_LIBRARY_PATH="$inst/lib"
|
||||||
|
|
||||||
osmo-build-dep.sh libosmocore
|
osmo-build-dep.sh libosmocore
|
||||||
|
|
||||||
"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
|
||||||
|
|
||||||
osmo-build-dep.sh libosmo-abis
|
osmo-build-dep.sh libosmo-abis
|
||||||
|
|
||||||
cd "$deps"
|
cd "$deps"
|
||||||
|
@ -24,10 +15,6 @@ cd "$deps"
|
||||||
# Get osmo-pcu for pcuif_proto.h
|
# Get osmo-pcu for pcuif_proto.h
|
||||||
osmo-deps.sh osmo-pcu
|
osmo-deps.sh osmo-pcu
|
||||||
|
|
||||||
# Get openbsc for gsm_data_shared.*
|
|
||||||
osmo-deps.sh openbsc
|
|
||||||
|
|
||||||
cd "$deps"
|
|
||||||
if ! test -d layer1-api;
|
if ! test -d layer1-api;
|
||||||
then
|
then
|
||||||
git clone git://git.osmocom.org/octphy-2g-headers layer1-api
|
git clone git://git.osmocom.org/octphy-2g-headers layer1-api
|
||||||
|
|
|
@ -1,26 +1,10 @@
|
||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
|
|
||||||
set -ex
|
# shellcheck source=contrib/jenkins_common.sh
|
||||||
|
. $(dirname "$0")/jenkins_common.sh
|
||||||
base="$PWD"
|
|
||||||
deps="$base/deps"
|
|
||||||
inst="$deps/install"
|
|
||||||
export deps inst
|
|
||||||
|
|
||||||
mkdir "$deps" || true
|
|
||||||
rm -rf "$inst"
|
|
||||||
|
|
||||||
# Get the headers..
|
|
||||||
cd "$deps"
|
|
||||||
git clone git://git.osmocom.org/openbsc || true
|
|
||||||
cd openbsc
|
|
||||||
git pull --rebase
|
|
||||||
cd "$base"
|
|
||||||
|
|
||||||
osmo-build-dep.sh libosmocore
|
osmo-build-dep.sh libosmocore
|
||||||
|
|
||||||
"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
|
|
||||||
|
|
||||||
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
export LD_LIBRARY_PATH="$inst/lib"
|
export LD_LIBRARY_PATH="$inst/lib"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue