pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37293?usp=email )
Change subject: asterisk-master: Build from jolly/work branch by default
......................................................................
asterisk-master: Build from jolly/work branch by default
That one will not be the final branch, but it's the one where most of
the development is happening. Hence, switch to that branch by default
for now, so that jenkins nightly job runs that branch.
Change-Id: Iabf141ae0b997f9707a7dbd555307e052b92d355
---
M make/Makefile
1 file changed, 15 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/make/Makefile b/make/Makefile
index 24308e5..4ee4525 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -17,7 +17,7 @@
USERNAME?=$(USER)
UID=$(shell id -u)
NAME?=$(shell basename $(CURDIR))
-ASTERISK_BRANCH?=sysmocom/master
+ASTERISK_BRANCH?=jolly/work
LIBOSMOCORE_BRANCH?=master
OSMO_TTCN3_BRANCH?=master
OSMO_BB_BRANCH?=master
@@ -42,7 +42,7 @@
OSMO_STP_BRANCH?=master
OSMO_UECUPS_BRANCH?=master
OPEN5GS_BRANCH?=main
-PJPROJECT_BRANCH?=sysmocom/2.14
+PJPROJECT_BRANCH?=jolly/work
BUILD_ARGS?=
RUN_ARGS?=-it
UPSTREAM_DISTRO?=debian:bookworm
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37293?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iabf141ae0b997f9707a7dbd555307e052b92d355
Gerrit-Change-Number: 37293
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(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
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37292?usp=email )
Change subject: asterisk-master: Fetch required branch directly
......................................................................
asterisk-master: Fetch required branch directly
When I added the Dockerfile I initially wrote it in a 2 step fetch &
build, to try to avoid recompiling the whole thing every time some patch
from one of the devs was pushed to our building branch.
This, whoever, creates problems sometimes due to how the build system
for pjproject is generated when building asterisk, so let's drop the
2stage setup to avoid problems fetching from different branches, etc.
Change-Id: Id9fbee9cdb8f9387e0daefd7925df2542d384a91
---
M asterisk-master/Dockerfile
1 file changed, 20 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile
index 8e508e4..8ddbaa0 100644
--- a/asterisk-master/Dockerfile
+++ b/asterisk-master/Dockerfile
@@ -60,10 +60,13 @@
# clone asterisk
ARG ASTERISK_REMOTE=https://gitea.sysmocom.de/sysmocom/asterisk.git
+ARG ASTERISK_BRANCH=sysmocom/master
RUN git clone $ASTERISK_REMOTE
+ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$AS… /tmp/asterisk-ver
+
RUN cd asterisk && \
- git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master
+ git fetch && git checkout -f -B $ASTERISK_BRANCH origin/$ASTERISK_BRANCH
# Use pjproject from git repo above instead of downloading tar.gz:
RUN cd asterisk/third-party/pjproject && \
@@ -72,17 +75,6 @@
RUN cd asterisk && \
./bootstrap.sh && \
./configure && \
- make "-j$(nproc)"
-
-ARG ASTERISK_BRANCH=sysmocom/master
-
-ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$AS… /tmp/asterisk-ver
-
-# update the source code (if needed)
-RUN cd asterisk && \
- git fetch && git checkout -B $ASTERISK_BRANCH origin/$ASTERISK_BRANCH
-
-RUN cd asterisk && \
make "-j$(nproc)" && \
make install && \
make samples && \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37292?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id9fbee9cdb8f9387e0daefd7925df2542d384a91
Gerrit-Change-Number: 37292
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(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 posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37294?usp=email )
Change subject: no_uring.opts: new file
......................................................................
Patch Set 1: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37294?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iafe1e78db66552e1b59818452570f9a6104742a3
Gerrit-Change-Number: 37294
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 26 Jun 2024 09:34:25 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37265?usp=email )
Change subject: sctp_proxy: fix no-op 'connecting' state timeout
......................................................................
sctp_proxy: fix no-op 'connecting' state timeout
We need to perform a loop state transition if we want the timer
to be scheduled for 'connecting'. Otherwise the timeout is no-op.
Change-Id: I45d874f3f73d5b9a8aa62c8a36e94e51497d6754
---
M src/sctp_proxy.erl
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl
index a40371d..82c697c 100644
--- a/src/sctp_proxy.erl
+++ b/src/sctp_proxy.erl
@@ -87,7 +87,7 @@
?LOG_INFO("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]),
%% Initiate connection establishment with the MME
{ok, Sock} = sctp_client:connect(MmeAddr, MmePort),
- {keep_state, S#{sock => Sock},
+ {next_state, connecting, S#{sock => Sock},
[{state_timeout, 2_000_000, conn_est_timeout}]};
%% Handle connection establishment timeout
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37265?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I45d874f3f73d5b9a8aa62c8a36e94e51497d6754
Gerrit-Change-Number: 37265
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(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