From d3d3ab7130fdbf9c76177e69ef0ce17f69603f2f Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 24 Mar 2023 13:36:55 +0100
Subject: [PATCH] TMSS-2261: moved unit/integration/regressions tests for TMSS
 into one job for speed and simplicity

---
 .gitlab-ci.yml | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24129408067..e8b58f6bb02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -455,7 +455,8 @@ integration_test_LTAIngest:
   rules:
     - if: '$FASTLANE == "false"'
 
-unit_and_integration_test_TMSS:
+unit_and_integration_and_regression_test_TMSS:
+  # for speed reasons, we just run all TMSS related unit/integration&regression tests in one job
   stage: integration_test
   image: ci_tmss:$CI_COMMIT_SHORT_SHA
   services:
@@ -468,7 +469,7 @@ unit_and_integration_test_TMSS:
     - PACKAGE=TMSS
     - echo "Unit & Integration Testing $PACKAGE..."
     - cd build/gnucxx11_opt
-    - SKIP_PYTHON_COVERAGE=true SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=false SKIP_REGRESSION_TESTS=true ctest
+    - SKIP_PYTHON_COVERAGE=true SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=false SKIP_REGRESSION_TESTS=false ctest
   interruptible: true
   needs:
     - build_TMSS
@@ -510,32 +511,6 @@ regression_test_SCU:
   rules:
     - if: '$FASTLANE == "false"'
 
-regression_test_TMSS:
-  stage: regression_test
-  image: ci_tmss:$CI_COMMIT_SHORT_SHA
-  services:
-    - rabbitmq:latest
-  variables:
-    RABBITMQ_DEFAULT_USER: guest
-    RABBITMQ_DEFAULT_PASS: guest
-    LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
-  script:
-    - PACKAGE=TMSS
-    - echo "Regression Testing $PACKAGE..."
-    - cd build/gnucxx11_opt
-    - SKIP_PYTHON_COVERAGE=true SKIP_REGRESSION_TESTS=false SKIP_UNIT_TESTS=true SKIP_INTEGRATION_TESTS=true ctest
-  interruptible: true
-  needs:
-    - build_TMSS
-  artifacts:
-    name: regression-test-report
-    when: always
-    paths:
-      - build/gnucxx11_opt/Testing/Temporary/LastTest.log
-  rules:
-    - if: '$FASTLANE == "false"'
-
-
 #
 # DEPLOY TEST STAGE
 #
@@ -647,7 +622,7 @@ deploy-tmss-prod:
   needs:
     - job: dockerize_TMSS
       artifacts: false
-    - job: unit_and_integration_test_TMSS
+    - job: unit_and_integration_and_regression_test_TMSS
       artifacts: false
   allow_failure: true
   when: manual
-- 
GitLab