Skip to content
Snippets Groups Projects
Commit 4e56f404 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

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

parent 7d2cb324
No related branches found
No related tags found
2 merge requests!110Resolve TMSS-163,!104Resolve TMSS-146
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 43 deletions
.gitlab-ci.yml
+ 46
− 43
View file @ 4e56f404
...@@ -22,11 +22,12 @@ prepare_ci_lta_docker_image: ...@@ -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_base -f Docker/lofar-ci/Dockerfile_ci_base .
- docker build -t ci_lta -f Docker/lofar-ci/Dockerfile_ci_lta . - docker build -t ci_lta -f Docker/lofar-ci/Dockerfile_ci_lta .
prepare_ci_mac_docker_image: #TODO: make proper MAC docker image with WinCC (rpm packages from mcu001)
stage: prepare #prepare_ci_mac_docker_image:
script: # stage: prepare
- docker build -t ci_base -f Docker/lofar-ci/Dockerfile_ci_base . # script:
- docker build -t ci_mac -f Docker/lofar-ci/Dockerfile_ci_mac . # - 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 # BUILD STAGE
...@@ -41,7 +42,7 @@ build_TMSS: ...@@ -41,7 +42,7 @@ build_TMSS:
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../.. - 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 - make install
dependencies: dependencies:
- prepare_ci_sas_docker_image - prepare_ci_sas_docker_image
...@@ -59,7 +60,7 @@ build_RAServices: ...@@ -59,7 +60,7 @@ build_RAServices:
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../.. - 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 - make install
dependencies: dependencies:
- prepare_ci_sas_docker_image - prepare_ci_sas_docker_image
...@@ -77,7 +78,7 @@ build_LTAIngest: ...@@ -77,7 +78,7 @@ build_LTAIngest:
- mkdir -p build/gnucxx11_opt - mkdir -p build/gnucxx11_opt
- cd build/gnucxx11_opt - cd build/gnucxx11_opt
- cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../.. - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
- make -j 6 - make -j 8
- make install - make install
dependencies: dependencies:
- prepare_ci_lta_docker_image - prepare_ci_lta_docker_image
...@@ -86,23 +87,24 @@ build_LTAIngest: ...@@ -86,23 +87,24 @@ build_LTAIngest:
paths: paths:
- build/gnucxx11_opt - build/gnucxx11_opt
build_MCU_MAC: # TODO: enable when prepare_ci_mac_docker_image is fixed
stage: build #build_MCU_MAC:
image: ci_mac:latest # stage: build
script: # image: ci_mac:latest
- PACKAGE=MCU_MAC # script:
- echo "Building $PACKAGE..." # - PACKAGE=MCU_MAC
- mkdir -p build/gnucxx11_opt # - echo "Building $PACKAGE..."
- cd build/gnucxx11_opt # - mkdir -p build/gnucxx11_opt
- cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../.. # - cd build/gnucxx11_opt
- make -j 6 # - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
- make install # - make -j 8
dependencies: # - make install
- prepare_ci_mac_docker_image # dependencies:
artifacts: # - prepare_ci_mac_docker_image
expire_in: 6 hours # artifacts:
paths: # expire_in: 6 hours
- build/gnucxx11_opt # paths:
# - build/gnucxx11_opt
# #
# DOCKERIZE # DOCKERIZE
...@@ -190,21 +192,22 @@ unit_test_LTAIngest: ...@@ -190,21 +192,22 @@ unit_test_LTAIngest:
paths: paths:
- build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
unit_test_MCU_MAC: # TODO: enable when build_MCU_MAC is fixed
stage: unit_test #unit_test_MCU_MAC:
image: ci_mac:latest # stage: unit_test
script: # image: ci_mac:latest
- PACKAGE=MCU_MAC # script:
- echo "Testing $PACKAGE..." # - PACKAGE=MCU_MAC
- cd build/gnucxx11_opt # - echo "Testing $PACKAGE..."
- SKIP_INTEGRATION_TESTS=true ctest # - cd build/gnucxx11_opt
dependencies: # - SKIP_INTEGRATION_TESTS=true ctest
- build_MCU_MAC # dependencies:
artifacts: # - build_MCU_MAC
name: unit-test-report # artifacts:
when: always # name: unit-test-report
paths: # when: always
- build/gnucxx11_opt/Testing/Temporary/LastTest.log # paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log
# #
# INTEGRATION TEST STAGE # INTEGRATION TEST STAGE
...@@ -301,7 +304,7 @@ deploy-tmss-test: ...@@ -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 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" - ssh lofarsys@scu199.control.lofar "docker-compose -f docker-compose-scu199.yml up -d"
dependencies: dependencies:
- build_TMSS - integration_test_TMSS
when: manual when: manual
deploy-tmss-ua: deploy-tmss-ua:
...@@ -324,7 +327,7 @@ 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 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" - ssh lofarsys@tmss-ua.control.lofar "docker-compose -f docker-compose-ua.yml up -d"
dependencies: dependencies:
- build_TMSS - integration_test_TMSS
when: manual when: manual
only: only:
- "TMSS-163" #- "master" - "master"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment