ci: skip merge-commit validation for integration branches

- use regex to match integration_YYYY_wWW branches Signed-off-by: Shubhika Garg <shubhika.garg@openairinterface.org>
ci: post MR validation comments only on warnings or errors in pre-ci-check
2026-07-18 07:00:30 +00:00 · 2026-05-04 16:41:26 +02:00 · 2026-05-04 16:41:19 +02:00 · 2026-05-04 11:42:21 +02:00 · 2026-04-30 10:59:17 +02:00
3 changed files with 11 additions and 7 deletions
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -98,7 +98,9 @@ pipeline {
            )
            def mrValidationMessage = readFile(mrValidationLog).trim()
            sh "rm -f ${mrValidationLog}"
-            addGitLabMRComment comment: "${mrValidationMessage}"
+            if (mrValidationExitCode >= 1) {
+              addGitLabMRComment comment: "${mrValidationMessage}"
+            }
            if (mrValidationExitCode >= 2) {
              error("${mrValidationMessage}")
            }
--- a/ci-scripts/pre-ci-check.sh
+++ b/ci-scripts/pre-ci-check.sh
@@ -58,11 +58,13 @@ done
 # Merged commits
 # ----------------------------
 mergeCommits=$(git rev-list --merges --abbrev-commit "$TARGET_BRANCH".."$SOURCE_BRANCH")
-if [[ -n "$mergeCommits" ]]; then
-    message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
-    message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
-    echo -e "$message"
-    exit 3
+if [[ ! "$SOURCE_BRANCH" =~ ^(origin/)?integration_[0-9]{4}_w[0-9]{2}$ ]]; then
+    if [[ -n "$mergeCommits" ]]; then
+        message="> ERROR: Following merge commits are found in the source branch history. Please rebase your branch.\n>\n"
+        message+="> $(echo "$mergeCommits" | paste -sd ',' -)\n"
+        echo -e "$message"
+        exit 3
+    fi
 fi

 # ----------------------------
--- a/radio/rfsimulator/simulator.cpp
+++ b/radio/rfsimulator/simulator.cpp
@@ -1324,7 +1324,7 @@ static void rfsimulator_read_internal(rfsimulator_state_t *t,
          rxAddInput(input, temp_array[aarx], aarx, ptr->channel_model, nsamps);
        }
      } else {
-        if (is_first_beam && is_first_peer && (ptr->nbAnt == 1 || nbAnt == 1)) {
+        if (is_first_beam && is_first_peer && (ptr->nbAnt == 1 && nbAnt == 1)) {
          // optimization: The buffer is uninitialized so samples can be written directly in the buffer
          combine_received_beams(t, ptr->received_packets, timestamp - t->chan_offset, 1, nsamps, rx_beam_id, samples);
        } else {
Author	SHA1	Message	Date
Shubhika Garg	1ab4ac59ff	ci: skip merge-commit validation for integration branches - use regex to match integration_YYYY_wWW branches Signed-off-by: Shubhika Garg <shubhika.garg@openairinterface.org>	2026-05-04 16:41:26 +02:00
Shubhika Garg	6e02b3a785	ci: post MR validation comments only on warnings or errors in pre-ci-check Signed-off-by: Shubhika Garg <shubhika.garg@openairinterface.org>	2026-05-04 16:41:19 +02:00
Jaroslava Fiedlerova	4855435793	Merge remote-tracking branch 'origin/hotfix_SIMO' into integration_2026_w19 (!4088 ) fixing wrong logic for SIMO and MISO AWGN channels Signed-off-by: Florian Kaltenberger <florian.kaltenberger@eurecom.fr> Reviewed-by: Bartosz Podrygajlo <bartosz.podrygajlo@openairinterface.org>	2026-05-04 11:42:21 +02:00
Florian Kaltenberger	d1b777e0a5	fixing wrong logic for SIMO and MISO AWGN channels Signed-off-by: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>	2026-04-30 10:59:17 +02:00