Merge branch 'master' into TMSS-551

Docker/lofar-ci/Dockerfile_ci_base

@@ -8,6 +8,7 @@ FROM centos:centos7.6.1810
 RUN yum -y groupinstall 'Development Tools' && \
     yum -y install epel-release && \
     yum -y install cmake cmake3 gcc git log4cplus-devel python3 python3-devel python3-pip which wget curl atop valgrind && \
+    python3 -m pip install -U pip && \
     pip3 install kombu==4.6.8 requests coverage python-qpid-proton && \
     adduser lofarsys && \
     mkdir -p /opt/lofar && chown -R lofarsys:lofarsys /opt

RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh

@@ -35,7 +35,8 @@ rm -f /tmp/${FILENAME}
 
 cd /opt/lofar-versions/${RELEASE_NAME} || exit 1
 
-# Sym link installed var/ to common location.
+# Sym link installed var/ to common location. Some tarballs linger an empty var dir, so remove that first
+[ -d var ] && rmdir var
 ln -sfT /localdata/lofar-userdata/var var
 
 # Sym link installed etc/parset-additions.d/override to common location.

SubSystems/SCU/CMakeLists.txt

+IF(SKIP_TMSS_BUILD) # This is needed for building on Jenkins. When fully on GitLab it can be removed again.
+set(BUILD_TESTING OFF)
+lofar_package(SCU
+                DEPENDS MAC_Services
+                        MoMQueryService
+                        MoMutils
+                        OTDBtoRATaskStatusPropagator
+                        RATaskSpecifiedService
+                        RAtoOTDBTaskSpecificationPropagator
+                        ResourceAssigner
+                        ResourceAssignmentDatabase
+                        ResourceAssignmentEditor
+                        ResourceAssignmentEstimator
+                        ResourceAssignmentService
+                        SpecificationServices
+                        TBB
+                        TBBService
+                        TriggerServices
+                        TriggerEmailService
+                        TaskPrescheduler
+                        CleanupService
+                        AutoCleanupService
+                        StorageQueryService
+                        QPIDInfrastructure
+                        RAScripts
+                        StaticMetaData
+                        RACommon
+                        ltastorageoverview
+                        QA_Service
+                        MessageLogger
+                        TMSSClient
+                        TMSSSchedulingService
+                        TMSSFeedbackHandlingService
+                        TMSSPostgresListenerService
+                        TMSSWebSocketService
+                        TMSSWorkflowService)
+ELSE()
 lofar_package(SCU
                 DEPENDS MAC_Services
                         MoMQueryService
@@ -33,6 +70,7 @@ lofar_package(SCU
                         TMSSPostgresListenerService
                         TMSSWebSocketService
                         TMSSWorkflowService)
+ENDIF(SKIP_TMSS_BUILD)
                       
 # supervisord config files
 lofar_add_sysconf_files(SCU.ini