Update main

Author: codebot

.gitlab-ci.yml

@@ -200,7 +200,7 @@ clangsa:
       mkdir -p build
       cd build
       cmake ..
-      cov-build --dir cov-int make -j`nproc`
+      cov-build --dir cov-int make -j${KUBERNETES_CPU_REQUEST}
       tar czvf srsgnb.tgz cov-int
       ver=$(git rev-parse HEAD)
 

.gitlab/ci/build.yml

@@ -121,6 +121,8 @@ variables:
     # CI
     SAVE_ARTIFACTS: "" # Empty by default
     KUBERNETES_MEMORY_REQUEST: 12Gi
+    KUBERNETES_CPU_REQUEST: 7
+    MAKE_ARGS: "-j${KUBERNETES_CPU_REQUEST}"
     GIT_STRATEGY: none
   needs:
     - !reference [.fetch_src_cache, needs]
@@ -249,13 +251,13 @@ variables:
             exit $ret
           fi
         fi
-        CTEST_CMD="ctest -j "$(nproc --all)" ${CTEST_SUBSET_CMD} $ctest_extra --schedule-random --output-on-failure --output-junit xunit.xml"
+        CTEST_CMD="ctest -j${KUBERNETES_CPU_REQUEST} ${CTEST_SUBSET_CMD} $ctest_extra --schedule-random --output-on-failure --output-junit xunit.xml"
         echo "${CTEST_CMD}"
         echo "============================================================================================="
         $CTEST_CMD && ret=0 || ret=1
 
         if [[ $TEST_MODE = "coverage" ]]; then 
-          common_options="-j $(nproc --all) \
+          common_options="-j${KUBERNETES_CPU_REQUEST} \
             --exclude-unreachable-branches \
             --gcov-ignore-parse-errors \
             --exclude=${CI_PROJECT_DIR}/tests/* \
@@ -379,9 +381,6 @@ variables:
 smoke release cached:
   extends: .smoke release
   timeout: 45 min
-  # variables:
-  # KUBERNETES_MEMORY_REQUEST: 6Gi
-  # MAKE_ARGS: ""
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
       when: never
@@ -394,8 +393,6 @@ smoke tsan cached:
   extends: .smoke tsan
   timeout: 45 min
   variables:
-    # KUBERNETES_MEMORY_REQUEST: 6Gi
-    # MAKE_ARGS: ""
     SAVE_ARTIFACTS: "True"
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
@@ -409,9 +406,6 @@ smoke rhel cached:
   extends: .smoke rhel
   stage: manual
   timeout: 45 min
-  # variables:
-  # KUBERNETES_MEMORY_REQUEST: 6Gi
-  # MAKE_ARGS: ""
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
       when: never
@@ -427,9 +421,6 @@ smoke archlinux cached:
   extends: .smoke archlinux
   stage: manual
   timeout: 45 min
-  # variables:
-  # KUBERNETES_MEMORY_REQUEST: 6Gi
-  # MAKE_ARGS: ""
   rules:
     - if: $CI_MERGE_REQUEST_LABELS =~ /no-cache/
       when: never
@@ -484,8 +475,6 @@ intermediate commits:
     AUTO_DETECT_ISA: "True"
     ENABLE_AVX512: "False"
     ENABLE_WERROR: "False"
-    # KUBERNETES_MEMORY_REQUEST: 6Gi
-    # MAKE_ARGS: ""
   tags: ["${AMD64_TAG}"]
   script:
     - git config advice.detachedHead false
@@ -522,14 +511,12 @@ valgrind changed tests:
     ENABLE_AVX512: "False"
     CLEAN_BUILD: "False"
     TEST_MODE: valgrind
-    # KUBERNETES_MEMORY_REQUEST: 6Gi
-    # MAKE_ARGS: ""
     FINGERPRINT: "fingerprints.csv"
     SAVE_ARTIFACTS: "True"
   tags: ["${AMD64_TAG}"]
   script:
     - git config advice.detachedHead false
-    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME --depth 20
+    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME --depth 40
     - |
       FORK_POINT=$(git merge-base origin/$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)
       echo "##################################################"

.gitlab/ci/builders.yml

@@ -70,7 +70,7 @@ stages:
         tar -xf "uhd-${uhd_version}.tar.gz"
         cd "uhd-${uhd_version}/host" && mkdir -p build && cd build
         cmake -DENABLE_LIBUHD=On -DCMAKE_INSTALL_PREFIX="${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd/${uhd_version}" .. || cmake -DENABLE_LIBUHD=On -DCMAKE_INSTALL_PREFIX="${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd/${uhd_version}" ..
-        make -j "$(nproc --all)"
+        make -j${KUBERNETES_CPU_REQUEST}
         make install
       }
 

.gitlab/ci/e2e.yml

@@ -49,7 +49,7 @@ variables:
       - warning
       - error
     value: "info"
-  RETINA_LAUNCHER_IMAGE: registry.gitlab.com/softwareradiosystems/ci/retina/launcher:0.10.3
+  RETINA_LAUNCHER_IMAGE: registry.gitlab.com/softwareradiosystems/ci/retina/launcher:0.11.1
 
 .txrx-lib: &txrx-lib
   - job: "build trx driver"
@@ -93,7 +93,7 @@ variables:
     - |
       cd tests/e2e
       export LOGNAME=ci_$GITLAB_USER_LOGIN
-    - retina-launcher --retina-request="${CI_PROJECT_DIR}/.gitlab/ci/e2e/retina_request_${TESTBED}.yml" --log-folder=./log --html=./log/report.html --self-contained-html --junitxml=out.xml "${PYTEST_ARGS}" -m "${MARKERS}" --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL "${RETINA_ARGS}"
+    - retina-launcher --retina-request="${CI_PROJECT_DIR}/.gitlab/ci/e2e/retina_request_${TESTBED}.yml" --log-folder=./log --html=./log/report.html --self-contained-html --junitxml=out.xml ${PYTEST_ARGS} -m "${MARKERS}" --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL ${RETINA_ARGS}
   after_script:
     - |
       echo "*******************************************************************************************************************************"
@@ -223,7 +223,6 @@ rf-asan:
   needs:
     - job: "basic asan"
       artifacts: true
-    - *txrx-lib
 
 rf-b200-config:
   extends: .rf
@@ -246,7 +245,6 @@ android:
   needs:
     - job: "smoke release update cache"
       artifacts: true
-    - *txrx-lib
 
 android-hp:
   extends: .e2e-run
@@ -256,12 +254,12 @@ android-hp:
   variables:
     TESTBED: "android_x300"
     MARKERS: "android_hp"
-    E2E_LOG_LEVEL: "warning"
+    E2E_LOG_LEVEL: "info"
     KUBECONFIG_VAR_NAME: "RETINA_HIGH_PERFORMANCE_LAB_KUBECONFIG"
+    PYTEST_ARGS: --graph-url $INFLUXDB_URL@$INFLUXDB_ORG:$INFLUXDB_TOKEN --graph-bucket e2e
   needs:
     - job: "smoke release update cache"
       artifacts: true
-    - *txrx-lib
 
 ################################################################################
 # Garbage collector

.gitlab/ci/e2e/.env

@@ -1,4 +1,4 @@
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-AGENT_VERSION=0.10.2
-AMARISOFT_VERSION=2023-02-06
+AGENT_VERSION=0.11.1
+AMARISOFT_VERSION=2023-03-17
 OPEN5GS_VERSION=2.5.6

.gitlab/ci/e2e/retina_request_android.yml

@@ -13,9 +13,10 @@
     cpu: 1
     memory: 2G
     ephemeral-storage: "3G"
+  mode: grpc
   resources:
     - type: android
-      model: one-plus-9-pro
+      model: one-plus-nord
 
 - name: srs-gnb
   type: gnb
@@ -24,6 +25,7 @@
     cpu: 6
     memory: 10G
     ephemeral-storage: "3G"
+  mode: grpc
   resources:
     - type: sdr
       model: b200
@@ -40,3 +42,4 @@
     memory: 4G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc

.gitlab/ci/e2e/retina_request_android_x300.yml

@@ -6,22 +6,14 @@
 # the distribution.
 #
 
-- name: open5gs
-  type: 5gc
-  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${AGENT_VERSION}
-  requirements:
-    cpu: 4
-    memory: 4G
-    ephemeral-storage: "3G"
-  taints: ["ci-amd64-onprem"]
-
 - name: android-ue
   type: ue
   image: ${RETINA_REGISTRY_PREFIX}/android:${AGENT_VERSION}
   requirements:
     cpu: 4
     memory: 2G
     ephemeral-storage: "3G"
+  mode: grpc
   resources:
     - type: android
       model: one-plus-9-pro
@@ -33,6 +25,7 @@
     cpu: 10
     memory: 20G
     ephemeral-storage: "3G"
+  mode: grpc
   resources:
     - type: sdr
       model: x300
@@ -41,4 +34,12 @@
       remote_path: /usr/local/bin
       is_executable: true
 
-
+- name: open5gs
+  type: 5gc
+  image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${AGENT_VERSION}
+  requirements:
+    cpu: 4
+    memory: 4G
+    ephemeral-storage: "3G"
+  taints: ["ci-amd64-onprem"]
+  mode: grpc

.gitlab/ci/e2e/retina_request_rf.yml

@@ -23,9 +23,10 @@
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${AGENT_VERSION}
   count: 4
   requirements:
-    cpu: 3
-    memory: 7G
+    cpu: 11
+    memory: 12G
     ephemeral-storage: "3G"
+  mode: grpc
   taints: ["uhd-lp-amd64-onprem"]
   resources:
     - type: sdr
@@ -37,10 +38,11 @@
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${AGENT_VERSION}
   requirements:
-    cpu: 3
-    memory: 7G
+    cpu: 11
+    memory: 12G
     ephemeral-storage: "3G"
   taints: ["uhd-lp-amd64-onprem"]
+  mode: grpc
   resources:
     - type: sdr
       model: b200
@@ -57,3 +59,4 @@
     memory: 4G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc

.gitlab/ci/e2e/retina_request_zmq.yml

@@ -27,6 +27,7 @@
     memory: 8G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc
   resources:
     - type: zmq
     - type: license
@@ -44,6 +45,7 @@
     memory: 8G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc
   resources:
     - type: zmq
   shared_files:
@@ -59,3 +61,4 @@
     ephemeral-storage: "3G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${AGENT_VERSION}
   taints: ["ci-amd64-onprem"]
+  mode: grpc

.gitlab/ci/e2e/retina_request_zmq_single_ue.yml

@@ -11,9 +11,10 @@
   image: ${RETINA_REGISTRY_PREFIX}/amarisoftue:${AMARISOFT_VERSION}_${AGENT_VERSION}
   requirements:
     cpu: 8
-    memory: 8G
+    memory: 1G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc
   resources:
     - type: zmq
     - type: license
@@ -28,9 +29,10 @@
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${AGENT_VERSION}
   requirements:
     cpu: 8
-    memory: 8G
+    memory: 4G
     ephemeral-storage: "3G"
   taints: ["ci-amd64-onprem"]
+  mode: grpc
   resources:
     - type: zmq
   shared_files:
@@ -42,7 +44,8 @@
   type: 5gc
   requirements:
     cpu: 4
-    memory: 4G
+    memory: 1G
     ephemeral-storage: "3G"
   image: ${RETINA_REGISTRY_PREFIX}/open5gs:${OPEN5GS_VERSION}_${AGENT_VERSION}
   taints: ["ci-amd64-onprem"]
+  mode: grpc