From 33bb95551a65da009eb49d6fc5e417a19e85eac7 Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Fri, 1 Dec 2023 09:49:33 -0800 Subject: [PATCH] Test opensips & master_2021 branch only. --- .github/workflows/RFC8760.yml | 6 +- .github/workflows/b2bua.yml | 63 ------------------ .github/workflows/go-b2bua.yml | 64 ------------------- .github/workflows/kamailio.yml | 62 ------------------ .github/workflows/opensips.yml | 16 ++--- .github/workflows/python-publish.yml | 34 ---------- install_depends/opensips.sh | 6 +- scenarios/UAC/opensips.cfg.in | 2 +- scenarios/UAS/auth/opensips.cfg.in | 2 +- .../UAS/auth_db/calculate_ha1/opensips.cfg.in | 2 +- scenarios/UAS/auth_db/ha1/opensips.cfg.in | 2 +- scenarios/passtr/opensips.cfg.in | 16 ++--- scenarios/simple/opensips.cfg.in | 16 ++--- test_run.sh | 2 +- 14 files changed, 30 insertions(+), 263 deletions(-) delete mode 100644 .github/workflows/b2bua.yml delete mode 100644 .github/workflows/go-b2bua.yml delete mode 100644 .github/workflows/kamailio.yml delete mode 100644 .github/workflows/python-publish.yml diff --git a/.github/workflows/RFC8760.yml b/.github/workflows/RFC8760.yml index 3d80c66..4e1d3e0 100644 --- a/.github/workflows/RFC8760.yml +++ b/.github/workflows/RFC8760.yml @@ -24,8 +24,8 @@ jobs: runs-on: ${{ matrix.os }} env: MM_TYPE: opensips - MM_BRANCH: master - MM_REPO: https://github.com/OpenSIPS/opensips.git + MM_BRANCH: master_2021 + MM_REPO: https://github.com/sippy/opensips.git MM_AUTH: ${{ matrix.mm-auth }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} @@ -42,8 +42,6 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - with: - ref: master - name: Set up Python ${{ env.python-version }} uses: actions/setup-python@v3 diff --git a/.github/workflows/b2bua.yml b/.github/workflows/b2bua.yml deleted file mode 100644 index 4a0a437..0000000 --- a/.github/workflows/b2bua.yml +++ /dev/null @@ -1,63 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Sippy Python B2B->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "0 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - env: - MM_TYPE: b2bua - MM_BRANCH: ${{ matrix.mm-branch }} - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - PYTHON_CMD: "python${{ matrix.python-version }}" - - strategy: - matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - mm-branch: ['master', 'PRACK'] - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.python-version }}_${{ matrix.mm-branch }}_${{ matrix.rtppc-type }} - path: | - b2bua.log - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/go-b2bua.yml b/.github/workflows/go-b2bua.yml deleted file mode 100644 index 961af68..0000000 --- a/.github/workflows/go-b2bua.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Sippy GO B2B->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "10 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - env: - MM_TYPE: go-b2bua - MM_BRANCH: master - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.10' - PYTHON_CMD: "python3.10" - - strategy: - matrix: - rtppc-type: ['unix', 'cunix', 'udp', 'udp6', 'tcp', 'tcp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ env.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ env.python-version }} - - - name: Install Golang - run: sudo apt-get update && sudo apt-get -y install golang-go - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.rtppc-type }} - path: | - b2bua.log - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/kamailio.yml b/.github/workflows/kamailio.yml deleted file mode 100644 index c13b722..0000000 --- a/.github/workflows/kamailio.yml +++ /dev/null @@ -1,62 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Alice->Kamailio->Bob - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events but only for the master branch - push: -# branches: [ master ] - pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - - schedule: - - cron: "20 0 * * *" - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-20.04 - env: - MM_TYPE: kamailio - MM_BRANCH: ${{ matrix.mm-branch }} - RTPP_BRANCH: master - RTPPC_TYPE: ${{ matrix.rtppc-type }} - python-version: '3.10' - PYTHON_CMD: "python3.10" - - strategy: - matrix: - mm-branch: ['master', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0', '4.4', '4.3', '4.2'] - rtppc-type: ['unix', 'udp', 'udp6'] - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - - name: Set up Python ${{ env.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ env.python-version }} - - - name: before_install - run: sh -x cibits/before_install.sh - - - name: script - run: sh -x ./test_run.sh - - - name: Test logs - uses: actions/upload-artifact@v3 - with: - name: test-logs_${{ matrix.mm-branch }}_${{ matrix.rtppc-type }} - path: | - kamailio.cfg - bob.log - alice.log - rtpproxy.log diff --git a/.github/workflows/opensips.yml b/.github/workflows/opensips.yml index be9735c..9bc9fec 100644 --- a/.github/workflows/opensips.yml +++ b/.github/workflows/opensips.yml @@ -24,6 +24,7 @@ jobs: runs-on: ${{ matrix.os }} env: MM_TYPE: opensips + MM_REPO: https://github.com/sippy/opensips.git MM_BRANCH: ${{ matrix.mm-branch }} RTPP_BRANCH: master RTPPC_TYPE: ${{ matrix.rtppc-type }} @@ -33,24 +34,15 @@ jobs: strategy: matrix: os: [ubuntu-latest] - mm-branch: ['master', '3.3', '3.2', '3.1', '3.0', '2.4'] + mm-branch: ['master_2021'] rtppc-type: ['unix', 'udp', 'udp6'] include: - - mm-branch: 'master' + - mm-branch: 'master_2021' os: ubuntu-latest rtppc-type: 'tcp' - - mm-branch: 'master' + - mm-branch: 'master_2021' os: ubuntu-latest rtppc-type: 'tcp6' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'unix' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'udp' - - mm-branch: '2.3' - os: ubuntu-20.04 - rtppc-type: 'udp6' # Steps represent a sequence of tasks that will be executed as part of the job steps: diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml deleted file mode 100644 index a6f93f1..0000000 --- a/.github/workflows/python-publish.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflows will upload a Python Package using Twine when a release is created -# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries - -name: Upload Python Package - -on: - release: - types: [created] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -jobs: - deploy: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install setuptools wheel twine - - name: Build and publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - python setup.py sdist - twine upload dist/* diff --git a/install_depends/opensips.sh b/install_depends/opensips.sh index fc24f4f..7025d4d 100755 --- a/install_depends/opensips.sh +++ b/install_depends/opensips.sh @@ -25,7 +25,7 @@ then fi git -C opensips rev-parse HEAD perl -pi -e 's|-O[3-9]|-O0 -g3|' "${MM_DIR}/Makefile.defs" - if [ "${MM_BRANCH}" != "master" -a "${MM_BRANCH}" != "3.2" -a "${MM_BRANCH}" != "3.3" ] + if [ "${MM_BRANCH}" != "master_2021" -a "${MM_BRANCH}" != "3.2" -a "${MM_BRANCH}" != "3.3" ] then MM_PATCH_SET="old/mod.rtpproxy_retry.diff" fi @@ -41,7 +41,7 @@ then do git -C opensips apply ${BUILDDIR}/install_depends/opensips/${p} done - if [ "${MM_BRANCH}" = "master" ] + if [ "${MM_BRANCH}" = "master_2021" ] then # git -C opensips revert -n 1eb4ec0f78f43f6ff546de49bc72e513876fb86b MM_KILL_MODULES="rabbitmq_consumer event_kafka" @@ -90,7 +90,7 @@ then do rm -rf "${MM_DIR}/modules/${m}" done - if [ "${MM_BRANCH}" = "master" ] + if [ "${MM_BRANCH}" = "master_2021" ] then _EXTRA_OPTS="CC_EXTRA_OPTS=-Werror" fi diff --git a/scenarios/UAC/opensips.cfg.in b/scenarios/UAC/opensips.cfg.in index 9125c0d..3990f5a 100644 --- a/scenarios/UAC/opensips.cfg.in +++ b/scenarios/UAC/opensips.cfg.in @@ -33,7 +33,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif diff --git a/scenarios/UAS/auth/opensips.cfg.in b/scenarios/UAS/auth/opensips.cfg.in index 5d90fbe..4a25b6b 100644 --- a/scenarios/UAS/auth/opensips.cfg.in +++ b/scenarios/UAS/auth/opensips.cfg.in @@ -39,7 +39,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif diff --git a/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in b/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in index a8adbf7..021a1ef 100644 --- a/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in +++ b/scenarios/UAS/auth_db/calculate_ha1/opensips.cfg.in @@ -43,7 +43,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif diff --git a/scenarios/UAS/auth_db/ha1/opensips.cfg.in b/scenarios/UAS/auth_db/ha1/opensips.cfg.in index c7d89bc..8e5d86f 100644 --- a/scenarios/UAS/auth_db/ha1/opensips.cfg.in +++ b/scenarios/UAS/auth_db/ha1/opensips.cfg.in @@ -43,7 +43,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif diff --git a/scenarios/passtr/opensips.cfg.in b/scenarios/passtr/opensips.cfg.in index 6abe475..834cd2f 100644 --- a/scenarios/passtr/opensips.cfg.in +++ b/scenarios/passtr/opensips.cfg.in @@ -1,4 +1,4 @@ -#if !(OPENSIPS_VER_FULL == master || OPENSIPS_VER >= 30) +#if !(OPENSIPS_VER_FULL == master_2021 || OPENSIPS_VER >= 30) #mode quote "`" #define INT(x) `"x`" #else @@ -7,13 +7,13 @@ mpath="dist/opensips/modules/" -#if (OPENSIPS_VER >= 21) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 21) || (OPENSIPS_VER_FULL == master_2021) loadmodule "proto_udp.so" ## dialog is now required by the rtpproxy, not sure why, but OK loadmodule "dialog/dialog.so" #endif -#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master_2021) loadmodule "sipmsgops/sipmsgops.so" #if MM_AUTH == UAC || MM_AUTH == UAS loadmodule "uac/uac.so" @@ -33,7 +33,7 @@ loadmodule "rr/rr.so" loadmodule "maxfwd/maxfwd.so" loadmodule "rtpproxy/rtpproxy.so" loadmodule "textops/textops.so" -#if !(OPENSIPS_VER_FULL == master || OPENSIPS_VER >= 30) +#if !(OPENSIPS_VER_FULL == master_2021 || OPENSIPS_VER >= 30) loadmodule "uri/uri.so" # define REWRITEPORT(value) rewriteport(INT(value)) @@ -41,13 +41,13 @@ loadmodule "uri/uri.so" # define REWRITEPORT(value) $rp = value #endif -#if (OPENSIPS_VER >= 23) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 23) || (OPENSIPS_VER_FULL == master_2021) # define XLOG xlog #else # define XLOG(a) #endif -#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master_2021) #define IS_METHOD is_method #define SRC_PORT $sp #define STATUS $rs @@ -70,7 +70,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif @@ -84,7 +84,7 @@ route { exit; }; -#if (OPENSIPS_VER < 24) && (OPENSIPS_VER_FULL != master) +#if (OPENSIPS_VER < 24) && (OPENSIPS_VER_FULL != master_2021) if (msg:len >= max_len) { sl_send_reply(INT(513), "Message too big"); exit; diff --git a/scenarios/simple/opensips.cfg.in b/scenarios/simple/opensips.cfg.in index a9ad5d1..ad8686f 100644 --- a/scenarios/simple/opensips.cfg.in +++ b/scenarios/simple/opensips.cfg.in @@ -1,4 +1,4 @@ -#if !(OPENSIPS_VER_FULL == master || OPENSIPS_VER >= 30) +#if !(OPENSIPS_VER_FULL == master_2021 || OPENSIPS_VER >= 30) #mode quote "`" #define INT(x) `"x`" #else @@ -7,13 +7,13 @@ mpath="dist/opensips/modules/" -#if (OPENSIPS_VER >= 21) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 21) || (OPENSIPS_VER_FULL == master_2021) loadmodule "proto_udp.so" ## dialog is now required by the rtpproxy, not sure why, but OK loadmodule "dialog/dialog.so" #endif -#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master_2021) loadmodule "sipmsgops/sipmsgops.so" #endif @@ -25,7 +25,7 @@ loadmodule "rr/rr.so" loadmodule "maxfwd/maxfwd.so" loadmodule "rtpproxy/rtpproxy.so" loadmodule "textops/textops.so" -#if !(OPENSIPS_VER_FULL == master || OPENSIPS_VER >= 30) +#if !(OPENSIPS_VER_FULL == master_2021 || OPENSIPS_VER >= 30) loadmodule "uri/uri.so" # define REWRITEPORT(value) rewriteport(INT(value)) @@ -33,13 +33,13 @@ loadmodule "uri/uri.so" # define REWRITEPORT(value) $rp = value #endif -#if (OPENSIPS_VER >= 23) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 23) || (OPENSIPS_VER_FULL == master_2021) # define XLOG xlog #else # define XLOG(a) #endif -#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master) +#if (OPENSIPS_VER >= 24) || (OPENSIPS_VER_FULL == master_2021) #define IS_METHOD is_method #define SRC_PORT $sp #define STATUS $rs @@ -54,7 +54,7 @@ modparam("rtpproxy", "rtpproxy_sock", RTPP_SOCK_TEST) listen=udp:127.0.0.1:5060 listen=udp:[::1]:5060 -#if OPENSIPS_VER_FULL == master +#if OPENSIPS_VER_FULL == master_2021 stderror_enabled=yes syslog_enabled=no #endif @@ -68,7 +68,7 @@ route { exit; }; -#if (OPENSIPS_VER < 24) && (OPENSIPS_VER_FULL != master) +#if (OPENSIPS_VER < 24) && (OPENSIPS_VER_FULL != master_2021) if (msg:len >= max_len) { sl_send_reply(INT(513), "Message too big"); exit; diff --git a/test_run.sh b/test_run.sh index fcfc717..b2296b0 100755 --- a/test_run.sh +++ b/test_run.sh @@ -82,7 +82,7 @@ start_mm() { cat -n "${MM_CFG}" echo "--- Config Ends ---" _MM_ARGS="-f ${MM_CFG} ${MM_ARGS} -F -n 1" - if [ "${MM_BRANCH}" != "master" ] + if [ "${MM_BRANCH}" != "master_2021" ] then _MM_ARGS="${_MM_ARGS} -E" fi