TMSS-163: commented out MAC, added TODO's for MAC

.gitlab-ci.yml

@@ -22,11 +22,12 @@ prepare_ci_lta_docker_image:
     - docker build -t ci_base -f  Docker/lofar-ci/Dockerfile_ci_base .
     - docker build -t ci_lta -f  Docker/lofar-ci/Dockerfile_ci_lta .
 
-prepare_ci_mac_docker_image:
-  stage: prepare
-  script:
-    - docker build -t ci_base -f  Docker/lofar-ci/Dockerfile_ci_base .
-    - docker build -t ci_mac -f  Docker/lofar-ci/Dockerfile_ci_mac .
+#TODO: make proper MAC docker image with WinCC (rpm packages from mcu001)
+#prepare_ci_mac_docker_image:
+#  stage: prepare
+#  script:
+#    - docker build -t ci_base -f  Docker/lofar-ci/Dockerfile_ci_base .
+#    - docker build -t ci_mac -f  Docker/lofar-ci/Dockerfile_ci_mac .
 
 #
 # BUILD STAGE
@@ -41,7 +42,7 @@ build_TMSS:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../..
-    - make -j 6
+    - make -j 8
     - make install
   dependencies:
     - prepare_ci_sas_docker_image
@@ -59,7 +60,7 @@ build_RAServices:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../..
-    - make -j 6
+    - make -j 8
     - make install
   dependencies:
     - prepare_ci_sas_docker_image
@@ -77,7 +78,7 @@ build_LTAIngest:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
-    - make -j 6
+    - make -j 8
     - make install
   dependencies:
     - prepare_ci_lta_docker_image
@@ -86,23 +87,24 @@ build_LTAIngest:
     paths:
       - build/gnucxx11_opt
 
-build_MCU_MAC:
-  stage: build
-  image: ci_mac:latest
-  script:
-    - PACKAGE=MCU_MAC
-    - echo "Building $PACKAGE..."
-    - mkdir -p build/gnucxx11_opt
-    - cd build/gnucxx11_opt
-    - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
-    - make -j 6
-    - make install
-  dependencies:
-    - prepare_ci_mac_docker_image
-  artifacts:
-    expire_in: 6 hours
-    paths:
-      - build/gnucxx11_opt
+# TODO: enable when prepare_ci_mac_docker_image is fixed
+#build_MCU_MAC:
+#  stage: build
+#  image: ci_mac:latest
+#  script:
+#    - PACKAGE=MCU_MAC
+#    - echo "Building $PACKAGE..."
+#    - mkdir -p build/gnucxx11_opt
+#    - cd build/gnucxx11_opt
+#    - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
+#    - make -j 8
+#    - make install
+#  dependencies:
+#    - prepare_ci_mac_docker_image
+#  artifacts:
+#    expire_in: 6 hours
+#    paths:
+#      - build/gnucxx11_opt
 
 #
 # DOCKERIZE
@@ -190,21 +192,22 @@ unit_test_LTAIngest:
     paths:
       - build/gnucxx11_opt/Testing/Temporary/LastTest.log
 
-unit_test_MCU_MAC:
-  stage: unit_test
-  image: ci_mac:latest
-  script:
-    - PACKAGE=MCU_MAC
-    - echo "Testing $PACKAGE..."
-    - cd build/gnucxx11_opt
-    - SKIP_INTEGRATION_TESTS=true ctest
-  dependencies:
-    - build_MCU_MAC
-  artifacts:
-    name: unit-test-report
-    when: always
-    paths:
-      - build/gnucxx11_opt/Testing/Temporary/LastTest.log
+# TODO: enable when build_MCU_MAC is fixed
+#unit_test_MCU_MAC:
+#  stage: unit_test
+#  image: ci_mac:latest
+#  script:
+#    - PACKAGE=MCU_MAC
+#    - echo "Testing $PACKAGE..."
+#    - cd build/gnucxx11_opt
+#    - SKIP_INTEGRATION_TESTS=true ctest
+#  dependencies:
+#    - build_MCU_MAC
+#  artifacts:
+#    name: unit-test-report
+#    when: always
+#    paths:
+#      - build/gnucxx11_opt/Testing/Temporary/LastTest.log
 
 #
 # INTEGRATION TEST STAGE
@@ -301,7 +304,7 @@ deploy-tmss-test:
     - ssh lofarsys@scu199.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_django:latest"
     - ssh lofarsys@scu199.control.lofar "docker-compose -f docker-compose-scu199.yml up -d"
   dependencies:
-    - build_TMSS
+    - integration_test_TMSS
   when: manual
 
 deploy-tmss-ua:
@@ -324,7 +327,7 @@ deploy-tmss-ua:
     - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_django:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_django:latest"
     - ssh lofarsys@tmss-ua.control.lofar "docker-compose -f docker-compose-ua.yml up -d"
   dependencies:
-    - build_TMSS
+    - integration_test_TMSS
   when: manual
   only:
-    - "TMSS-163" #- "master"
+    - "master"