From 99724a07ba764f7f32a102973957799bcc721421 Mon Sep 17 00:00:00 2001
From: Reiner Hauser <reiner.hauser@cern.ch>
Date: Wed, 5 Aug 2020 12:01:53 +0000
Subject: [PATCH 1/3] Prepare for gcc 10.

Use gcc10 only in dev4 builds until LCG_98 is out.

Disable gcc 9 builds.
---
 .gitlab-ci.yml | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71b2af74..779f5371 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,17 +228,23 @@ build/x86_64-centos7-gcc8-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-build/x86_64-centos7-gcc9-opt:
+build/x86_64-centos7-gcc10-opt:
     extends: .build
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
+    only:
+        variables:
+            - $DEV
 
-build/x86_64-centos7-gcc9-dbg:
+build/x86_64-centos7-gcc10-dbg:
     extends: .build
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
+    only:
+        variables:
+            - $DEV
 
 build/x86_64-centos7-clang10-opt:
     extends: .build
@@ -279,31 +285,6 @@ full-ci/x86_64-centos7-gcc8-opt:
             - tdaq/$CI_COMMIT_REF_NAME/installed
         expire_in: 1 day    
 
-# Special CI build for tdaq-99-00-02 from default branch
-# but using tdaq-common-99-00-02
-.ers-ci/x86_64-centos7-gcc8-opt:
-    extends: build/x86_64-centos7-gcc8-opt
-    tags:
-        - tdaq-ci        
-    variables:
-        TDAQ_COMMON_VERSION: tdaq-common-99-00-02
-        CMAKE_OPTIONS: -D TDAQ_NO_DEBUG_INSTALL=TRUE -D USE_CCACHE=TRUE -D TDAQ_VERSION=99.0.2 -D TDAQ_COMMON_VERSION=99.0.2
-        CTEST_OPTIONS: -D CTEST_TRACK=Continuous -D CTEST_BUILD_NAME=CI-ERS-x86_64-centos7-gcc8-opt  
-    only:
-        refs:
-            - tdaq-99-00-00
-        variables:
-            - $PACKAGES == null
-    except:
-        - triggers
-        - web
-        - schedules
-    artifacts:
-        paths:
-            - tdaq-common/tdaq-common-99-00-02/installed
-            - tdaq/tdaq-99-00-02/installed
-        expire_in: 1 day    
-
 #
 # The job for continuous builds.
 #
@@ -348,13 +329,13 @@ continuous/x86_64-centos7-gcc8-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-continuous/x86_64-centos7-gcc9-opt:
+.continuous/x86_64-centos7-gcc9-opt:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc9-opt
 
-continuous/x86_64-centos7-gcc9-dbg:
+.continuous/x86_64-centos7-gcc9-dbg:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
@@ -429,13 +410,13 @@ patches/x86_64-centos8-gcc-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-patches/x86_64-centos9-gcc-opt:
+.patches/x86_64-centos9-gcc-opt:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc9-opt
 
-patches/x86_64-centos9-gcc-dbg:
+.patches/x86_64-centos9-gcc-dbg:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-- 
GitLab


From 0714bfaa008e59dd537fe8641723187e77f5ce5f Mon Sep 17 00:00:00 2001
From: Reiner Hauser <reiner.hauser@cern.ch>
Date: Wed, 12 Aug 2020 13:51:01 +0200
Subject: [PATCH 2/3] Now that LCG_98 appears, don't distinguish dev4 and
 nightly builds.

Just move tdaq-common-cmake/CMakeLists.txt file to LCG_98python3
when merging this.
---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 779f5371..db03d37d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,18 +233,12 @@ build/x86_64-centos7-gcc10-opt:
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc10-opt
-    only:
-        variables:
-            - $DEV
 
 build/x86_64-centos7-gcc10-dbg:
     extends: .build
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc10-dbg
-    only:
-        variables:
-            - $DEV
 
 build/x86_64-centos7-clang10-opt:
     extends: .build
-- 
GitLab


From 6cd9162d134d8091de801e2fb58b9bb37dd2f613 Mon Sep 17 00:00:00 2001
From: Reiner Hauser <reiner.hauser@cern.ch>
Date: Fri, 14 Aug 2020 09:26:59 +0200
Subject: [PATCH 3/3] Prepare for gcc10 continuous and patch entries.

---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db03d37d..d2794e40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -323,17 +323,17 @@ continuous/x86_64-centos7-gcc8-dbg:
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-.continuous/x86_64-centos7-gcc9-opt:
+.continuous/x86_64-centos7-gcc10-opt:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
 
-.continuous/x86_64-centos7-gcc9-dbg:
+.continuous/x86_64-centos7-gcc10-dbg:
     extends: .continuous
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
 
 .continuous/x86_64-slc6-gcc8-opt:
     extends: .continuous
@@ -392,29 +392,29 @@ continuous/x86_64-centos7-gcc8-dbg:
 #
 # One per CMTCONFIG, disable by putting . in front of name
 #
-patches/x86_64-centos8-gcc-opt:
+patches/x86_64-centos7-gcc8-opt:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-opt
 
-patches/x86_64-centos8-gcc-dbg:
+patches/x86_64-centos7-gcc8-dbg:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
         CMTCONFIG: x86_64-centos7-gcc8-dbg
 
-.patches/x86_64-centos9-gcc-opt:
+.patches/x86_64-centos7-gcc10-opt:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-opt
+        CMTCONFIG: x86_64-centos7-gcc10-opt
 
-.patches/x86_64-centos9-gcc-dbg:
+.patches/x86_64-centos7-gcc10-dbg:
     extends: .patches
     image: gitlab-registry.cern.ch/atlas-tdaq-software/tdaq_ci:centos7
     variables:
-        CMTCONFIG: x86_64-centos7-gcc9-dbg
+        CMTCONFIG: x86_64-centos7-gcc10-dbg
 
 .patches/x86_64-slc6-gcc-opt:
     extends: .patches
-- 
GitLab