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

Merge branch 'TMSS-208-take-2' into 'master' 

Resolve TMSS-208

Closes TMSS-208

See merge request !166
parents 24ed7354 b8d2141b
No related branches found
No related tags found
1 merge request!166Resolve TMSS-208
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 155
− 155
View file @ b636c0c2
...@@ -117,88 +117,88 @@ build_MCU_MAC: ...@@ -117,88 +117,88 @@ build_MCU_MAC:
# UNIT TEST STAGE # UNIT TEST STAGE
# #
#unit_test_TMSS: unit_test_TMSS:
# stage: unit_test stage: unit_test
# image: ci_sas:$CI_COMMIT_SHORT_SHA image: ci_sas:$CI_COMMIT_SHORT_SHA
# script: script:
# - PACKAGE=TMSS - PACKAGE=TMSS
# - echo "Testing $PACKAGE..." - echo "Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=true ctest - SKIP_INTEGRATION_TESTS=true ctest
# dependencies: dependencies:
# - build_TMSS - build_TMSS
# artifacts: artifacts:
# name: unit-test-report name: unit-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
#unit_test_RAServices: unit_test_RAServices:
# stage: unit_test stage: unit_test
# image: ci_sas:$CI_COMMIT_SHORT_SHA image: ci_sas:$CI_COMMIT_SHORT_SHA
# script: script:
# - PACKAGE=RAServices - PACKAGE=RAServices
# - echo "Testing $PACKAGE..." - echo "Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=true ctest - SKIP_INTEGRATION_TESTS=true ctest
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# dependencies: dependencies:
# - build_RAServices - build_RAServices
# artifacts: artifacts:
# name: unit-test-report name: unit-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
#unit_test_LTAIngest: unit_test_LTAIngest:
# stage: unit_test stage: unit_test
# image: ci_lta:$CI_COMMIT_SHORT_SHA image: ci_lta:$CI_COMMIT_SHORT_SHA
# script: script:
# - PACKAGE=LTAIngest - PACKAGE=LTAIngest
# - echo "Testing $PACKAGE..." - echo "Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=true ctest - SKIP_INTEGRATION_TESTS=true ctest
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# dependencies: dependencies:
# - build_LTAIngest - build_LTAIngest
# artifacts: artifacts:
# name: unit-test-report name: unit-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
#unit_test_MCU_MAC: unit_test_MCU_MAC:
# stage: unit_test stage: unit_test
# image: ci_mac:$CI_COMMIT_SHORT_SHA image: ci_mac:$CI_COMMIT_SHORT_SHA
# script: script:
# - echo "Starting Qpid server..." && qpidd & - echo "Starting Qpid server..." && qpidd &
# - PACKAGE=MCU_MAC - PACKAGE=MCU_MAC
# - echo "Testing $PACKAGE..." - echo "Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=true ctest - SKIP_INTEGRATION_TESTS=true ctest
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# dependencies: dependencies:
# - build_MCU_MAC - build_MCU_MAC
# artifacts: artifacts:
# name: unit-test-report name: unit-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
# allow_failure: true # allow failure for now, so MAC_MCU failure does not block this pipeline and we can deploy TMSS. TODO: fix docker_mac environment and services so the tests pass. # allow_failure: true # allow failure for now, so MAC_MCU failure does not block this pipeline and we can deploy TMSS. TODO: fix docker_mac environment and services so the tests pass.
# #
...@@ -222,79 +222,79 @@ dockerize_TMSS: ...@@ -222,79 +222,79 @@ dockerize_TMSS:
- docker logout $CI_NEXUS_REGISTRY - docker logout $CI_NEXUS_REGISTRY
dependencies: dependencies:
- build_TMSS - build_TMSS
# - unit_test_TMSS - unit_test_TMSS
# - integration_test_TMSS - integration_test_TMSS
# #
# INTEGRATION TEST STAGE # INTEGRATION TEST STAGE
# #
#integration_test_TMSS: integration_test_TMSS:
# stage: integration_test stage: integration_test
# image: ci_sas:$CI_COMMIT_SHORT_SHA image: ci_sas:$CI_COMMIT_SHORT_SHA
# script: script:
# - PACKAGE=TMSS - PACKAGE=TMSS
# - echo "Integration Testing $PACKAGE..." - echo "Integration Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# dependencies: dependencies:
# - build_TMSS - build_TMSS
# artifacts: artifacts:
# name: integration-test-report name: integration-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
#integration_test_RAServices: integration_test_RAServices:
# stage: integration_test stage: integration_test
# image: ci_sas:$CI_COMMIT_SHORT_SHA image: ci_sas:$CI_COMMIT_SHORT_SHA
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# script: script:
# - PACKAGE=RAServices - PACKAGE=RAServices
# - echo "Integration Testing $PACKAGE..." - echo "Integration Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
# dependencies: dependencies:
# - build_RAServices - build_RAServices
# artifacts: artifacts:
# name: integration-test-report name: integration-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
#
#integration_test_LTAIngest: integration_test_LTAIngest:
# stage: integration_test stage: integration_test
# image: ci_lta:$CI_COMMIT_SHORT_SHA image: ci_lta:$CI_COMMIT_SHORT_SHA
# script: script:
# - PACKAGE=LTAIngest - PACKAGE=LTAIngest
# - echo "Integration Testing $PACKAGE..." - echo "Integration Testing $PACKAGE..."
# - cd build/gnucxx11_opt - cd build/gnucxx11_opt
# - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
# services: services:
# - rabbitmq:latest - rabbitmq:latest
# variables: variables:
# RABBITMQ_DEFAULT_USER: guest RABBITMQ_DEFAULT_USER: guest
# RABBITMQ_DEFAULT_PASS: guest RABBITMQ_DEFAULT_PASS: guest
# LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq. LOFAR_DEFAULT_BROKER: 'rabbitmq' # override default 'localhost' which does not work for CI service rabbitmq.
# dependencies: dependencies:
# - build_LTAIngest - build_LTAIngest
# artifacts: artifacts:
# name: integration-test-report name: integration-test-report
# when: always when: always
# paths: paths:
# - build/gnucxx11_opt/Testing/Temporary/LastTest.log - build/gnucxx11_opt/Testing/Temporary/LastTest.log
# #
...@@ -320,8 +320,8 @@ deploy-tmss-test: ...@@ -320,8 +320,8 @@ deploy-tmss-test:
- ssh lofarsys@scu199.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_testprovider:latest" - ssh lofarsys@scu199.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_testprovider: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 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:
# - integration_test_TMSS - integration_test_TMSS
when: manual when: manual
deploy-tmss-ua: deploy-tmss-ua:
...@@ -343,8 +343,8 @@ deploy-tmss-ua: ...@@ -343,8 +343,8 @@ deploy-tmss-ua:
- ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_testprovider:latest" - ssh lofarsys@tmss-ua.control.lofar "docker tag ${CI_NEXUS_REGISTRY}/tmss_testprovider:$CI_COMMIT_SHORT_SHA ${CI_NEXUS_REGISTRY}/tmss_testprovider: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 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:
# - integration_test_TMSS - integration_test_TMSS
when: manual when: manual
only: only:
- "master" - "master"
...@@ -361,6 +361,6 @@ deploy-MCU_MAC-test: ...@@ -361,6 +361,6 @@ deploy-MCU_MAC-test:
- chmod 644 ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts
script: script:
- ssh lofarsys@mcu199.control.lofar "MAC_install -b ${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA} -v ${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}" - ssh lofarsys@mcu199.control.lofar "MAC_install -b ${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA} -v ${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
# dependencies: dependencies:
# - unit_test_MCU_MAC - unit_test_MCU_MAC
when: manual when: manual
\ No newline at end of file
Docker/lofar-ci/Dockerfile_ci_base
+ 1
− 1
View file @ b636c0c2
...@@ -8,7 +8,7 @@ FROM centos:centos7.6.1810 ...@@ -8,7 +8,7 @@ FROM centos:centos7.6.1810
RUN yum -y groupinstall 'Development Tools' && \ RUN yum -y groupinstall 'Development Tools' && \
yum -y install epel-release && \ yum -y install epel-release && \
yum -y install cmake cmake3 gcc git log4cplus-devel python3 python3-devel python3-pip which wget curl atop valgrind && \ yum -y install cmake cmake3 gcc git log4cplus-devel python3 python3-devel python3-pip which wget curl atop valgrind && \
pip3 install kombu requests coverage python-qpid-proton && \ pip3 install kombu==4.6.8 requests coverage python-qpid-proton && \
adduser lofarsys && \ adduser lofarsys && \
mkdir -p /opt/lofar && chown -R lofarsys:lofarsys /opt mkdir -p /opt/lofar && chown -R lofarsys:lofarsys /opt
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment