Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-11-02 Thread Pau Espin Pedrol 
Pau Espin Pedrol has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..

contrib/jenkins.sh: Update to current osmocom infra

Otherwise builds end failing in osmocom jenkins/gerrit.

Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
---
M contrib/jenkins.sh
1 file changed, 38 insertions(+), 12 deletions(-)

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



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e099ceb..7ec1463 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,19 +1,45 @@
 #!/usr/bin/env bash
+# jenkins build helper script for osmo-pcap.  This is how we build on 
jenkins.osmocom.org
+
+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

 set -ex

-rm -rf deps/install
-mkdir deps || true
-cd deps
-osmo-deps.sh libosmocore

-cd libosmocore
-autoreconf --install --force
-./configure --prefix=$PWD/../install
-$MAKE $PARALLEL_MAKE install
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst

-cd ../../
+osmo-clean-workspace.sh
+
+mkdir "$deps" || true
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
+
+set +x
+echo
+echo
+echo
+echo " === osmo-pcap 
==="
+echo
+set -x
+
+
+cd "$base"
 autoreconf --install --force
-PCAP_LIBS="-lpcap" PCAP_CFLAGS="" 
PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure 
--with-pcap-config=/bin/true --enable-sanitize --enable-werror
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE
-DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" 
PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig 
LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck
+PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true 
--enable-sanitize --enable-werror
+$MAKE $PARALLEL_MAKE
+$MAKE check || cat-testlogs.sh
+DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \
+PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \
+$MAKE distcheck || cat-testlogs.sh
+
+osmo-clean-workspace.sh

--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-11-01 Thread daniel 
daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 2: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Thu, 01 Nov 2018 19:40:22 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-11-01 Thread Pau Espin Pedrol 
Hello daniel, Harald Welte, Jenkins Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11549

to look at the new patch set (#2).

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..

contrib/jenkins.sh: Update to current osmocom infra

Otherwise builds end failing in osmocom jenkins/gerrit.

Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
---
M contrib/jenkins.sh
1 file changed, 38 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/49/11549/2
--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 22:11:10 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread Pau Espin Pedrol 
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh
File contrib/jenkins.sh:

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh@42
PS1, Line 42: $MAKE distcheck || cat-testlogs.sh
> Interesting, it worked when I tried it. […]
Making check in tests
make[2]: Entering directory 
'/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests'
make  check-local
make[3]: Entering directory 
'/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests'
make[3]: *** No rule to make target 'atconfig', needed by 'check-local'.  Stop.
make[3]: Leaving directory 
'/home/pespin/dev/sysmocom/build/new/tmpdir/osmo-pcap/tests'
make[2]: *** [Makefile:316: check-am] Error 2



-- 
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 18:39:00 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread daniel 
daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh
File contrib/jenkins.sh:

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh@42
PS1, Line 42: $MAKE distcheck || cat-testlogs.sh
> Because at least locally make check failed due to some at{foobar} makefile 
> target not working, so I  […]
Interesting, it worked when I tried it. distcheck will also run make check so 
maybe make sure that that works for you as well. It does here.



--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 18:31:45 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread Pau Espin Pedrol 
Pau Espin Pedrol has posted comments on this change. ( 
https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh
File contrib/jenkins.sh:

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh@42
PS1, Line 42: $MAKE distcheck || cat-testlogs.sh
> cat-testlogs. […]
Because at least locally make check failed due to some at{foobar} makefile 
target not working, so I didn't invest time on fixing it since we don't have 
tests anyway.



--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 18:23:01 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread daniel 
daniel has posted comments on this change. ( https://gerrit.osmocom.org/11549 )

Change subject: contrib/jenkins.sh: Update to current osmocom infra
..


Patch Set 1: Code-Review+1

(1 comment)

Looks okay comparing it to an existing jenkins.sh in osmo-bsc

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh
File contrib/jenkins.sh:

https://gerrit.osmocom.org/#/c/11549/1/contrib/jenkins.sh@42
PS1, Line 42: $MAKE distcheck || cat-testlogs.sh
cat-testlogs.sh wouldn't actually do anything useful since we don't have tests 
(yet?), but it shouldn't do any harm, either. If you want to leave it in for 
future tests why not leave the make check call in as well since there is 
already an empty testsuite?



--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: daniel 
Gerrit-Comment-Date: Wed, 31 Oct 2018 18:16:28 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-pcap[master]: contrib/jenkins.sh: Update to current osmocom infra

2018-10-31 Thread Pau Espin Pedrol 
Pau Espin Pedrol has uploaded this change for review. ( 
https://gerrit.osmocom.org/11549


Change subject: contrib/jenkins.sh: Update to current osmocom infra
..

contrib/jenkins.sh: Update to current osmocom infra

Otherwise builds end failing in osmocom jenkins/gerrit.

Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
---
M contrib/jenkins.sh
1 file changed, 37 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/49/11549/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e099ceb..d708369 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,19 +1,44 @@
 #!/usr/bin/env bash
+# jenkins build helper script for osmo-pcap.  This is how we build on 
jenkins.osmocom.org
+
+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

 set -ex

-rm -rf deps/install
-mkdir deps || true
-cd deps
-osmo-deps.sh libosmocore

-cd libosmocore
-autoreconf --install --force
-./configure --prefix=$PWD/../install
-$MAKE $PARALLEL_MAKE install
+base="$PWD"
+deps="$base/deps"
+inst="$deps/install"
+export deps inst

-cd ../../
+osmo-clean-workspace.sh
+
+mkdir "$deps" || true
+
+verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+
+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
+export LD_LIBRARY_PATH="$inst/lib"
+osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls'
+
+set +x
+echo
+echo
+echo
+echo " === osmo-pcap 
==="
+echo
+set -x
+
+
+cd "$base"
 autoreconf --install --force
-PCAP_LIBS="-lpcap" PCAP_CFLAGS="" 
PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig ./configure 
--with-pcap-config=/bin/true --enable-sanitize --enable-werror
-PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig $MAKE $PARALLEL_MAKE
-DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" PCAP_LIBS="-lpcap" 
PCAP_CFLAGS="" PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig 
LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck
+PCAP_LIBS="-lpcap" PCAP_CFLAGS="" ./configure --with-pcap-config=/bin/true 
--enable-sanitize --enable-werror
+$MAKE $PARALLEL_MAKE
+DISTCHECK_CONFIGURE_FLAGS="--with-pcap-config=/bin/true" \
+PCAP_LIBS="-lpcap" PCAP_CFLAGS="" \
+$MAKE distcheck || cat-testlogs.sh
+
+osmo-clean-workspace.sh

--
To view, visit https://gerrit.osmocom.org/11549
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I955b99ce27df143f5d022619dd14e32b763e6c14
Gerrit-Change-Number: 11549
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol