From fd9266b24ac8935ccc67d026545c8713743de84a Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 17 Jun 2020 10:49:07 +0200
Subject: [PATCH] Fix CI settings

---
 .gitlab-ci.yml     | 62 ++++++++++++++++++++++++++--------------------
 CbmRoot_test.cmake | 12 ++++++---
 Dart.sh            |  2 ++
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0beeac3..da5164ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ CbmRoot_Continuous:
     - master
   only:
     variables:
-      - $CI_PROJECT_PATH == "CbmSoft/CbmRoot"
+      - $CI_PROJECT_PATH == "computing/cbmroot"
   cache:
     paths:
       - build/
@@ -56,27 +56,27 @@ CbmRoot_Continuous:
     - find . -name "all_*.par" -delete
     - cd ..
 
-FormatCheck:
-  stage: build
-  tags:
-    - CbmRoot
-  only:
-    - merge_requests
-  only:
-    variables:
-      - $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "CbmSoft/CbmRoot"
-  script:
-    - set -xv
-    - echo "export FAIRSOFT_VERSION=jun19p1" >> Dart.cfg
-    - echo "export FAIRROOT_VERSION=v18.2.0" >> Dart.cfg
-    - echo "export SIMPATH=/cvmfs/fairroot.gsi.de/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
-    - echo "export BUILDDIR=$PWD/build" >> env.sh
-    - echo "export SOURCEDIR=$PWD" >> env.sh
-    - echo "export PATH=\$SIMPATH/bin:$PATH" >> env.sh
-    - ls
-    - pwd
-    - cat env.sh
-    - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
+#FormatCheck:
+#  stage: build
+#  tags:
+#    - CbmRoot
+#  only:
+#    - merge_requests
+#  only:
+#    variables:
+#      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot"
+#  script:
+#    - set -xv
+#    - echo "export FAIRSOFT_VERSION=jun19p1" >> Dart.cfg
+#    - echo "export FAIRROOT_VERSION=v18.2.0" >> Dart.cfg
+#    - echo "export SIMPATH=/cvmfs/fairroot.gsi.de/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
+#    - echo "export BUILDDIR=$PWD/build" >> env.sh
+#    - echo "export SOURCEDIR=$PWD" >> env.sh
+#    - echo "export PATH=\$SIMPATH/bin:$PATH" >> env.sh
+#    - ls
+#    - pwd
+#    - cat env.sh
+#    - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
 
 CbmRoot_Merge:
   stage: build
@@ -84,11 +84,19 @@ CbmRoot_Merge:
     - CbmRoot
   only:
     - merge_requests  
-  only:
-    variables:
-      - $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "CbmSoft/CbmRoot"
+#  only:
+#    variables:
+#      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot"
   script:
-    - set -xv
+#    - set -xv
+    - echo $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH
+    - echo $CI_MERGE_REQUEST_PROJECT_PATH
+#    - if [ "$CI_MERGE_REQUEST_PROJECT_PATH" == "computing/cbmroot" ]; then
+#    -   echo "Here"
+#    - fi
+    - echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+    - echo $CI_MERGE_REQUEST_ID
+    - echo $CI_MERGE_REQUEST_IID
     - echo "export LINUX_FLAVOUR=Debian8.11" >> Dart.cfg
     - echo "export FAIRSOFT_VERSION=jun19p1" >> Dart.cfg
     - echo "export FAIRROOT_VERSION=v18.2.0" >> Dart.cfg
@@ -101,7 +109,7 @@ CbmRoot_Merge:
     - ls
     - pwd
     - cat Dart.cfg
-    - $PWD/Dart.sh Nightly Dart.cfg
+    - $PWD/Dart.sh Continuous Dart.cfg
 
 pages:
   stage: documentation
diff --git a/CbmRoot_test.cmake b/CbmRoot_test.cmake
index 5579349a..e357f65a 100644
--- a/CbmRoot_test.cmake
+++ b/CbmRoot_test.cmake
@@ -6,11 +6,11 @@ Set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 Set(CTEST_PROJECT_NAME "CBMROOT")
 Set(EXTRA_FLAGS $ENV{EXTRA_FLAGS})
 
-Set(CTEST_UPDATE_COMMAND "svn")
+Set(CTEST_UPDATE_COMMAND "git")
 
-If($ENV{ctest_model} MATCHES Continuous)
-  Set(CTEST_SVN_UPDATE_OPTIONS "$ENV{REVISION}")
-EndIf($ENV{ctest_model} MATCHES Continuous)
+#If($ENV{ctest_model} MATCHES Continuous)
+#  Set(CTEST_SVN_UPDATE_OPTIONS "$ENV{REVISION}")
+#EndIf($ENV{ctest_model} MATCHES Continuous)
 
 Set(BUILD_COMMAND "make")
 Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
@@ -85,6 +85,10 @@ Ctest_Read_Custom_Files("${CTEST_BINARY_DIRECTORY}")
 
 Ctest_Start($ENV{ctest_model})
 
+If($ENV{ctest_model} MATCHES Continuous)
+  set(ENV{ctest_model} Nightly)
+EndIf()
+
 If(NOT $ENV{ctest_model} MATCHES Experimental)
   Ctest_Update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
 EndIf()
diff --git a/Dart.sh b/Dart.sh
index 6d60fede..6064523f 100755
--- a/Dart.sh
+++ b/Dart.sh
@@ -80,6 +80,8 @@ fi
 
 if [ "${ctest_model}" == "Weekly" ]; then
   export LABEL1=${LINUX_FLAVOUR}-$SYSTEM-$COMPILER$GCC_VERSION-${ctest_model}-fairsoft_$FAIRSOFT_VERSION-fairroot_$FAIRROOT_VERSION
+elif [ "${ctest_model}" == "Continuous" ]; then
+  export LABEL1=${LINUX_FLAVOUR}-$SYSTEM-$COMPILER$GCC_VERSION-fairsoft_$FAIRSOFT_VERSION-fairroot_${FAIRROOT_VERSION}_MR-$CI_MERGE_REQUEST_IID
 else
   export LABEL1=${LINUX_FLAVOUR}-$SYSTEM-$COMPILER$GCC_VERSION-fairsoft_$FAIRSOFT_VERSION-fairroot_$FAIRROOT_VERSION
 fi
-- 
GitLab