Update main

# Conflicts: # apps/gnb/adapters/e1ap_gateway_local_connector.cpp # apps/gnb/adapters/e1ap_gateway_local_connector.h # include/srsran/adt/any.h # include/srsran/adt/variant.h # lib/scheduler/ue_scheduling/ue_pdsch_param_candidate_searcher.h # tests/e2e/tests/viavi/test_declaration.yml # tests/e2e/tests/viavi/test_declaration_debug.yml # tests/unittests/adt/optional_test.cpp # tests/unittests/phy/upper/dl_processor_test_data.h # tests/unittests/scheduler/ue_scheduling/ue_pdsch_param_candidate_searcher_test.cpp
srsran · Jun 10, 2024 · c33cacb · c33cacb
2 parents b9ae240 + 0f4830f
commit c33cacb
Show file tree

Hide file tree

Showing 524 changed files with 17,697 additions and 14,396 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,16 +25,16 @@
 
 include:
   - project: softwareradiosystems/ci/tools
-    ref: "17"
+    ref: "18"
     file: .gitlab/ci-shared/setup/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "17"
+    ref: "18"
     file: .gitlab/ci-shared/features/all.yml
   - project: softwareradiosystems/ci/tools
-    ref: "17"
+    ref: "18"
     file: .gitlab/ci-shared/tools/python.yml
   - project: softwareradiosystems/ci/tools
-    ref: "17"
+    ref: "18"
     file: .gitlab/ci-shared/tools/test_reporter.yml
   - local: .gitlab/ci/builders/version.yml
   - local: .gitlab/ci/build.yml
@@ -58,7 +58,7 @@ variables:
   SLACK_CHANNEL_OK: "#ci_gnb"
   SLACK_CHANNEL_FAIL: "#ci_gnb"
   SLACK_CHANNEL_INFO_MSG: "#ci_gnb_verbose"
-  AUTOREBASER_MODE: minimal
+  AUTOREBASER_PRS_IN_QUEUE: 1
 
 ################################################################################
 ## CI