Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30048 )
Change subject: vty/logging.h: Avoid -Werror=pragmas error in C++ code
......................................................................
Patch Set 1:
(1 comment)
File include/osmocom/vty/logging.h:
https://gerrit.osmocom.org/c/libosmocore/+/30048/comment/a8bf64b3_84cc3492
PS1, Line 15: #pragma GCC diagnostic pop
needs another pop
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30048
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I85596cf4538d7a8c522f4bce1620a2d19e2a910e
Gerrit-Change-Number: 30048
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Mon, 07 Nov 2022 09:09:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/30048 )
Change subject: vty/logging.h: Avoid -Werror=pragmas error in C++ code
......................................................................
vty/logging.h: Avoid -Werror=pragmas error in C++ code
The newly-introdiced pragma to disable strict-prototypes checking works
in C, but creates a -Werror=pragmas error in C++ code:
In file included from osmo-trx.cpp:45:
/build/deps/install/stow/libosmocore/include/osmocom/vty/logging.h:10:32: error: option
‘-Wstrict-prototypes’ is valid for C/ObjC but not for C++ [-Werror=pragmas]
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
So let's also suppress those errors for that one line of code...
Change-Id: I85596cf4538d7a8c522f4bce1620a2d19e2a910e
---
M include/osmocom/vty/logging.h
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/30048/1
diff --git a/include/osmocom/vty/logging.h b/include/osmocom/vty/logging.h
index 9be96e5..b3ce92c 100644
--- a/include/osmocom/vty/logging.h
+++ b/include/osmocom/vty/logging.h
@@ -7,6 +7,7 @@
struct log_info;
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
/* note this undefined argument declaration is intentional. There used
* to be an argument until 2017 which we no longer need .*/
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30048
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I85596cf4538d7a8c522f4bce1620a2d19e2a910e
Gerrit-Change-Number: 30048
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30047 )
Change subject: hnbgw: Only build with_pfcp on master
......................................................................
hnbgw: Only build with_pfcp on master
The functionality is not in -latest yet so running osmo-hnbgw with this
configuration fails which in turn fails the test in jenkins instead of
just marking it unstable.
Change-Id: I4309c323c1d61e8f22dae499c407d57999f6f13a
---
M ttcn3-hnbgw-test/jenkins.sh
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/30047/1
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 8c1ddf5..fee2728 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -80,6 +80,9 @@
echo Testing without PFCP
run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
-echo Testing with PFCP
-mkdir "$VOL_BASE_DIR_PFCP"
-run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
+# Disable until osmo-hnbgw release >1.3.0
+if image_suffix_is_master; then
+ echo Testing with PFCP
+ mkdir "$VOL_BASE_DIR_PFCP"
+ run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
+fi
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I4309c323c1d61e8f22dae499c407d57999f6f13a
Gerrit-Change-Number: 30047
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29957 )
Change subject: trxcon: merge TRXCON_EV_TX_TRAFFIC_* with TRXCON_EV_TX_DATA_*
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
File src/host/trxcon/src/trxcon.c:
https://gerrit.osmocom.org/c/osmocom-bb/+/29957/comment/adad70e0_c046dd81
PS1, Line 216: case L1SCHED_DT_TRAFFIC:
> Yes, trxcon currently treats packed data as traffic. […]
I also found this confusing. maybe add a comment there or a note in the commit message?
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29957
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I8c2b3274f32d4d52424512d988b93d6233dd09a0
Gerrit-Change-Number: 29957
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 07 Nov 2022 08:26:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30006 )
Change subject: jenkins-gerrit: display JOB_TYPE infront of url
......................................................................
jenkins-gerrit: display JOB_TYPE infront of url
In the summary comment posted by jenkins to the patch on gerrit, display
the JOB_TYPE infront of the URL instead of "build", if the build job is
a matrix job that uses JOB_TYPE as variable.
For such jobs, it changes:
[build] https://jenkins.osmocom.org/…
[build] https://jenkins.osmocom.org/…
[build] https://jenkins.osmocom.org/…
[build] https://jenkins.osmocom.org/…
[lint] https://jenkins.osmocom.org/…
to:
[manuals] https://jenkins.osmocom.org/…
[gateware] https://jenkins.osmocom.org/…
[firmware] https://jenkins.osmocom.org/…
[software] https://jenkins.osmocom.org/…
[lint] https://jenkins.osmocom.org/…
JOB_TYPE is used by osmo-e1-hardware and pysim.
Change-Id: I51f49e4799961776dbddaedd76c14ed37a0e6c84
---
M scripts/jenkins-gerrit/pipeline_summary.py
1 file changed, 19 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py
index 44424d7..53c0f4a 100755
--- a/scripts/jenkins-gerrit/pipeline_summary.py
+++ b/scripts/jenkins-gerrit/pipeline_summary.py
@@ -10,6 +10,8 @@
jenkins_url = "https://jenkins.osmocom.org"
re_start_build = re.compile("Starting building: gerrit-[a-zA-Z-_0-9]* #[0-9]*")
re_result = re.compile("^PIPELINE_[A-Z]*_PASSED=[01]$")
+re_job_type = re.compile("JOB_TYPE=([a-zA-Z-_0-9]*),")
+
def parse_args():
parser = argparse.ArgumentParser(
@@ -128,10 +130,26 @@
return ret
+def get_job_short_name(job):
+ """ :returns: a short job name, usually the stage (lint, deb, rpm, build).
+ Or in case of build a more useful name like the JOB_TYPE part
+ of the URL if it is found. For osmo-e1-hardware it could be
+ one of: manuals, gateware, firmware, software """
+ global re_job_type
+ stage = job["stage"]
+
+ if stage == "build":
+ match = re_job_type.search(job["url"])
+ if match:
+ return match.group(1)
+
+ return stage
+
+
def get_jobs_list_str(jobs):
ret = ""
for job in jobs:
- ret += f" [{job['stage']}] {job['url']}/consoleFull\n"
+ ret += f" [{get_job_short_name(job)}] {job['url']}/consoleFull\n"
return ret
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30006
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51f49e4799961776dbddaedd76c14ed37a0e6c84
Gerrit-Change-Number: 30006
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
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/pysim/+/30004 )
Change subject: contrib/jenkins.sh: split test/pylint/docs
......................................................................
contrib/jenkins.sh: split test/pylint/docs
Split the jenkins job up in three parts, so each of them can run in
parallel, and the test part that has to run on a specific node (and
blocks it while running), finishes faster.
Don't install depends of pylint/docs jobs as they will run in docker
and the depends get installed once in the container.
Related: OS#5497
Depends: docker-playground Id5c75725d2fab46b29773fa4f637fa2d73fa7291
Depends: osmo-ci Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4
Change-Id: I5245c529db729e209d78a02ab9c917a90d0e0206
---
M contrib/jenkins.sh
1 file changed, 37 insertions(+), 29 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 0ade9b4..34f47ea 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -4,6 +4,7 @@
# environment variables:
# * WITH_MANUALS: build manual PDFs if set to "1"
# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")
+# * JOB_TYPE: one of 'test', 'pylint', 'docs'
#
export PYTHONUNBUFFERED=1
@@ -15,36 +16,43 @@
exit 1
fi
-virtualenv -p python3 venv --system-site-packages
-. venv/bin/activate
-pip install -r requirements.txt
+case "$JOB_TYPE" in
+"test")
+ virtualenv -p python3 venv --system-site-packages
+ . venv/bin/activate
-# Execute automatically discovered unit tests first
-python -m unittest discover -v -s tests/
+ pip install -r requirements.txt
-# Run pylint to find potential errors
-# Ignore E1102: not-callable
-# pySim/filesystem.py: E1102: method is not callable (not-callable)
-# Ignore E0401: import-error
-# pySim/utils.py:276: E0401: Unable to import 'Crypto.Cipher' (import-error)
-# pySim/utils.py:277: E0401: Unable to import 'Crypto.Util.strxor' (import-error)
-pip install pylint
-python -m pylint -j0 --errors-only \
- --disable E1102 \
- --disable E0401 \
- --enable W0301 \
- pySim *.py
+ # Execute automatically discovered unit tests first
+ python -m unittest discover -v -s tests/
-# attempt to build documentation
-pip install sphinx
-pip install sphinxcontrib-napoleon
-pip3 install -e 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse'
-(cd docs && make html latexpdf)
+ # Run the test with physical cards
+ cd pysim-testdata
+ ../tests/pysim-test.sh
+ ;;
+"pylint")
+ # Run pylint to find potential errors
+ # Ignore E1102: not-callable
+ # pySim/filesystem.py: E1102: method is not callable (not-callable)
+ # Ignore E0401: import-error
+ # pySim/utils.py:276: E0401: Unable to import 'Crypto.Cipher' (import-error)
+ # pySim/utils.py:277: E0401: Unable to import 'Crypto.Util.strxor' (import-error)
+ python3 -m pylint -j0 --errors-only \
+ --disable E1102 \
+ --disable E0401 \
+ --enable W0301 \
+ pySim *.py
+ ;;
+"docs")
+ rm -rf docs/_build
+ make -C "docs" html latexpdf
-if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
- make -C "docs" publish publish-html
-fi
-
-# run the test with physical cards
-cd pysim-testdata
-../tests/pysim-test.sh
+ if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
+ make -C "docs" publish publish-html
+ fi
+ ;;
+*)
+ set +x
+ echo "ERROR: JOB_TYPE has unexpected value '$JOB_TYPE'."
+ exit 1
+esac
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/30004
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I5245c529db729e209d78a02ab9c917a90d0e0206
Gerrit-Change-Number: 30004
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged