diff options
author | Andreas Eversberg <jolly@eversberg.eu> | 2024-03-12 14:09:33 +0100 |
---|---|---|
committer | Andreas Eversberg <jolly@eversberg.eu> | 2024-03-18 13:56:04 +0100 |
commit | 2827dd25f4e802ab0e260f9d65f64abeccb9f68b (patch) | |
tree | f444366ae2716abc10f924779f82a474f3e9a2f0 | |
parent | 47c44ac5375340ad29c4ee88353e61db1aeba914 (diff) |
jolly testingjolly/testing
-rw-r--r-- | make/Makefile | 2 | ||||
-rw-r--r-- | osmo-bsc-master/Dockerfile | 81 | ||||
-rw-r--r-- | osmo-stp-master/Dockerfile | 32 | ||||
-rwxr-xr-x | ttcn3-bsc-test/jenkins.sh | 3 | ||||
-rwxr-xr-x | ttcn3-msc-test/jenkins.sh | 2 | ||||
-rw-r--r-- | ttcn3-stp-test/STP_Tests.cfg | 13 | ||||
-rwxr-xr-x | ttcn3-stp-test/jenkins.sh | 5 |
7 files changed, 137 insertions, 1 deletions
diff --git a/make/Makefile b/make/Makefile index 7266662..a27b377 100644 --- a/make/Makefile +++ b/make/Makefile @@ -18,6 +18,7 @@ USERNAME?=$(USER) UID=$(shell id -u) NAME?=$(shell basename $(CURDIR)) LIBOSMOCORE_BRANCH?=master +LIBOSMONETIF_BRANCH?=master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master @@ -101,6 +102,7 @@ docker-build: .release --build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \ --build-arg OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \ --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \ + --build-arg LIBOSMONETIF_BRANCH=$(LIBOSMONETIF_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 65ec5d4..76cef4e 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -34,6 +34,85 @@ RUN case "$DISTRO" in \ WORKDIR /tmp +# Download, build and install libosmocore +ARG LIBOSMOCORE_BRANCH="master" +RUN git clone https://gerrit.osmocom.org/libosmocore.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmocore/+/$LIBOSMOCORE_BRANCH?format=TEXT /tmp/commit-libosmocore + +RUN cd libosmocore \ + && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ + && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --disable-pcsc \ + --prefix=/usr/local \ + --enable-sanitize \ + && make -j5 \ + && make install \ + && make distclean && ldconfig + + +ARG LIBOSMOABIS_BRANCH="master" +RUN git clone https://gerrit.osmocom.org/libosmo-abis.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-abis/+/$LIBOSMOABIS_BRANCH?format=TEXT /tmp/commit-libosmoabis + +RUN cd libosmo-abis \ + && git fetch && git checkout -f -B $LIBOSMOABIS_BRANCH origin/$LIBOSMOABIS_BRANCH \ + && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --prefix=/usr/local \ + --enable-sanitize \ + && make -j5 \ + && make install \ + && make distclean && ldconfig + +ARG LIBOSMONETIF_BRANCH="master" +RUN git clone https://gerrit.osmocom.org/libosmo-netif.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-netif/+/$LIBOSMONETIF_BRANCH?format=TEXT /tmp/commit-libosmonetif + +RUN cd libosmo-netif \ + && git fetch && git checkout -f -B $LIBOSMONETIF_BRANCH origin/$LIBOSMONETIF_BRANCH \ + && git rev-parse --abbrev-ref HEAD && git rev-parse HEAD \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --prefix=/usr/local \ + --enable-sanitize \ + && make -j8 \ + && make install \ + && make distclean && ldconfig + +ARG OSMO_STP_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/libosmo-sccp.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-sccp/+/$OSMO_STP_BRANCH?format=TEXT /tmp/commit-libosmosccp +RUN cd libosmo-sccp && \ + git fetch && git checkout $OSMO_STP_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_STP_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure --enable-sanitize && \ + make "-j$(nproc)" install && \ + install examples/.libs/sccp_demo_user /usr/local/bin/ && \ + ldconfig + +ARG OSMO_MGW_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/osmo-mgw.git +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-mgw/+/$OSMO_MGW_BRANCH?format=TEXT /tmp/commit-osmo-mgw + +RUN cd osmo-mgw && \ + git fetch && git checkout $OSMO_MGW_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_MGW_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ + autoreconf -fi && \ + ./configure && \ + make "-j$(nproc)" install && \ + ldconfig + ARG OSMO_BSC_BRANCH="master" RUN git clone https://gerrit.osmocom.org/osmo-bsc.git @@ -44,7 +123,7 @@ RUN cd osmo-bsc && \ (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BSC_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure && \ + ./configure --enable-sanitize && \ make "-j$(nproc)" install VOLUME /data diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 2e6ecd6..1366a15 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -23,6 +23,38 @@ RUN case "$DISTRO" in \ WORKDIR /data +ARG LIBOSMOCORE_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/libosmocore.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmocore/+/$LIBOSMOCORE_BRANCH?format=TEXT /tmp/commit-libosmocore + +RUN cd libosmocore \ + && git fetch && git checkout -f -B $LIBOSMOCORE_BRANCH origin/$LIBOSMOCORE_BRANCH \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --disable-pcsc \ + --prefix=/usr/local \ + && make -j5 \ + && make install \ + && make distclean && ldconfig + +ARG LIBOSMONETIF_BRANCH="master" + +RUN git clone https://gerrit.osmocom.org/libosmo-netif.git +ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-netif/+/$LIBOSMONETIF_BRANCH?format=TEXT /tmp/commit-libosmonetif + +RUN cd libosmo-netif \ + && git fetch && git checkout -f -B $LIBOSMONETIF_BRANCH origin/$LIBOSMONETIF_BRANCH \ + && autoreconf -fi \ + && ./configure \ + --disable-doxygen \ + --prefix=/usr/local \ + && make -j8 \ + && echo $LIBOSMONETIF_BRANCH \ + && make install \ + && make distclean && ldconfig + ARG OSMO_STP_BRANCH="master" RUN git clone https://gerrit.osmocom.org/libosmo-sccp.git diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 0a3128c..d30a73f 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -30,6 +30,7 @@ echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ --ulimit core=-1 \ + -e LIBOSMO_IO_BACKEND=IO_URING \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ $DOCKER_ARGS \ @@ -39,6 +40,7 @@ echo Starting container with BSC docker run --rm \ $(docker_network_params $SUBNET 20) \ --ulimit core=-1 \ + -e LIBOSMO_IO_BACKEND=IO_URING \ -v $VOL_BASE_DIR/bsc:/data \ --name ${BUILD_TAG}-bsc -d \ $DOCKER_ARGS \ @@ -52,6 +54,7 @@ for i in "0 1" "1 1" "2 4"; do docker run --rm \ $(docker_network_params $SUBNET 10$1) \ --ulimit core=-1 \ + -e LIBOSMO_IO_BACKEND=IO_URING \ -v $VOL_BASE_DIR/bts-omldummy:/data \ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index 6a0f3d5..fe10bb0 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -31,6 +31,7 @@ echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ --ulimit core=-1 \ + -e LIBOSMO_IO_BACKEND=IO_URING \ -v $VOL_BASE_DIR/stp:/data \ --name ${BUILD_TAG}-stp -d \ $REPO_USER/osmo-stp-$IMAGE_SUFFIX @@ -39,6 +40,7 @@ echo Starting container with MSC docker run --rm \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ + -e LIBOSMO_IO_BACKEND=IO_URING \ -v $VOL_BASE_DIR/msc:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-msc -d \ diff --git a/ttcn3-stp-test/STP_Tests.cfg b/ttcn3-stp-test/STP_Tests.cfg index 15baf7e..6a05032 100644 --- a/ttcn3-stp-test/STP_Tests.cfg +++ b/ttcn3-stp-test/STP_Tests.cfg @@ -21,3 +21,16 @@ STP_Tests_M3UA.mp_local_m3ua_ip := { "172.18.19.203", "fd02:db8:19::203" }; STP_Tests_M3UA.control STP_Tests_IPA.control STP_Tests.control + +#STP_Tests_M3UA.TC_m3ua_tcp_cli_srv +#STP_Tests_M3UA.TC_m3ua_tcp_srv + + +#STP_Tests_M3UA.TC_clnt_connect_asp_up +#STP_Tests_M3UA.TC_clnt_asp_act +#STP_Tests_M3UA.TC_clnt_sg_to_asp +#STP_Tests_M3UA.TC_clnt_asp_to_sg + + +#STP_Tests_M3UA.TC_rkm_unreg_active +#STP_Tests_M3UA.TC_clnt_connect_asp_up diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index f6768f0..efb17c8 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -1,5 +1,10 @@ #!/bin/sh +#export OSMO_TTCN3_BRANCH=jolly/ttcn3 +#export LIBOSMOCORE_BRANCH=jolly/testing +export LIBOSMONETIF_BRANCH=jolly/testing +#export OSMO_STP_BRANCH=jolly/testing + . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" docker_images_require \ |