Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/650a3323_e56d6021
PS1, Line 41: git -C "$proj" clean -ffxd
> I don't really like the idea of doing 2 different things based on some external "use case". […]
Okay I see your point, changed it to only behave differently if environment variables are set, and set them in the local test script.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 13:33:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/28492
to look at the new patch set (#2).
Change subject: coverity/local_test.sh: new file
......................................................................
coverity/local_test.sh: new file
Add the script I've used to locally reproduce the build failure and fix
it.
Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
---
M coverity/jenkins.sh
A coverity/local_test.sh
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/28492/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28492
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
Gerrit-Change-Number: 28492
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
Hello Jenkins Builder, pespin, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/28491
to look at the new patch set (#2).
Change subject: coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
......................................................................
coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
When running these scripts locally while developing, it's more useful to
not fetch the sources and clean the git repository instead. Add
environment variables that allow doing this.
Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/28491/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: clean existing git dirs
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/01ca120c_bcc2337e
PS1, Line 41: git -C "$proj" clean -ffxd
> I think there are two use cases: […]
I don't really like the idea of doing 2 different things based on some external "use case".
If you want fast iterations at a specific time, then better disable it manually for the time you do it. I don't think it makes sense to have one path updating the content while the other doesn't, this will end up in strange behaviors which are difficult to follow.
If other people disagree with me, then go on, +2 and merge.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 12:59:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: clean existing git dirs
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/63b475bb_3fe1783b
PS1, Line 41: git -C "$proj" clean -ffxd
> this should also pull latest master, since that's what git clone is doing below.
I think there are two use cases:
1. jenkins, which removes the source directories and does a fresh clone
2. development of these scripts where we want fast iterations. running git fetch/pull on each repo just slows it down.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 12:55:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28489 )
Change subject: coverity/build_Osmocom.sh: don't do check for all
......................................................................
coverity/build_Osmocom.sh: don't do check for all
'make check' does not pass for asn1c, it fails with the following. I
looked into it and the cause is not obvious to me, so in order to make
the jenkins job pass again I've changed it back to just run 'make'
instead.
Fix for:
...
fatal: making test-suite.log: failed to create ../tests/98-attribute-class-OK.asn1.log
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.trs
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.log
Makefile:735: recipe for target 'test-suite.log' failed
make[3]: *** [test-suite.log] Error 1
make[3]: Leaving directory '/home/osmocom-build/osmo-ci/coverity/source-Osmocom/asn1c/libasn1fix'
Makefile:841: recipe for target 'check-TESTS' failed
Disable 'make check' for libusrp too as it also didn't pass:
Making check in usrp2
make[4]: Entering directory '/tmp/coverity/source-Osmocom/libusrp/firmware/src/usrp2'
test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' .
test -f ../common/`basename 'eeprom_boot.a51'` -o \
\! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \
|| ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'`
sdas8051 -plosgff `basename 'eeprom_boot.a51'`
sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \
-c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c
test -f `basename '_startup.a51'` || ln -s '_startup.a51' .
test -f ../common/`basename '_startup.a51'` -o \
\! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \
|| ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'`
sdas8051 -plosgff `basename '_startup.a51'`
make[4]: *** No rule to make target '../../lib/libfx2.lib', needed by 'eeprom_boot.ihx'. Stop.
All other 'make check' calls do work as expected, the build script runs
through again with this patch.
Fixes: bf84ba9f ("coverity/build_Osmocom.sh: run 'make check' in do_build()")
Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
---
M coverity/build_Osmocom.sh
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index fe9806c..ec764be 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -5,6 +5,7 @@
base_dir="$PWD"
src_dir="$base_dir/source-Osmocom"
prefix="$base_dir/install-Osmocom"
+check="check"
install -d "$prefix"
@@ -18,10 +19,16 @@
--disable-doxygen \
$*
- make $PARALLEL_MAKE check
+ make $PARALLEL_MAKE $check
make install
}
+do_build_no_check() {
+ check=""
+ do_build "$@"
+ check="check"
+}
+
build_default() {
pushd $1
shift
@@ -29,6 +36,13 @@
popd
}
+build_no_check() {
+ pushd $1
+ shift
+ do_build_no_check $*
+ popd
+}
+
build_layer1api() {
pushd layer1-api
install -d "$prefix/include/sysmocom/femtobts/"
@@ -69,10 +83,10 @@
rm -rf "$prefix"
build_layer1api
-build_default asn1c
+build_no_check asn1c
build_default libosmocore
build_libasn1c
-build_libusrp
+build_no_check libusrp
build_default libosmo-abis
build_default libosmo-netif
build_default libosmo-sccp
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28489
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
Gerrit-Change-Number: 28489
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28490 )
Change subject: coverity/prepare_source: fix running twice
......................................................................
coverity/prepare_source: fix running twice
Don't attempt to clone layer1-api if it exists already. Jenkins deletes
the sources for every run, but for development it is useful to be able
to run this script multiple times without getting errors.
Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh
index ab8b2bd..09608eb 100755
--- a/coverity/prepare_source_Osmocom.sh
+++ b/coverity/prepare_source_Osmocom.sh
@@ -44,4 +44,6 @@
fi
done
-git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+if ! [ -d layer1-api ]; then
+ git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28490
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
Gerrit-Change-Number: 28490
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
