From 04be2ac2796022a2d2b367fdfa31cee1618931c0 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Fri, 16 Oct 2020 00:08:26 +0800
Subject: [PATCH] WIP: support both lcg and key4hep stack.
---
.build.ci.sh | 17 +++++++++++++----
.travis.yml | 6 +++++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/.build.ci.sh b/.build.ci.sh
index 7b1b8b64..0ea25cd0 100644
--- a/.build.ci.sh
+++ b/.build.ci.sh
@@ -1,13 +1,22 @@
#!/bin/bash
# This is wrapper to run the build.sh on CI
-source setup.sh
-./build.sh >& mylog.sh &
-buildpid=$!
+logfile=mylog.txt
+
+if [ "$LCG_RELEASE" = "KEY4HEP_STACK" ]; then
+ logfile=mylog-k4.sh
+ source /cvmfs/sw.hsf.org/key4hep/setup.sh
+ ./build-k4.sh >& ${logfile} &
+ buildpid=$!
+else
+ source setup.sh
+ ./build.sh >& ${logfile} &
+ buildpid=$!
+fi
while ps -p $buildpid 2>/dev/null ; do
sleep 60
done
-tail -n100 mylog.sh
+tail -n100 ${logfile}
diff --git a/.travis.yml b/.travis.yml
index 6feb6e21..86b4f626 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ language: cpp
env:
matrix:
- COMPILER=gcc; LCG_RELEASE=LCG_96c_LS; STANDARD=17; COMPILER_VERSION=gcc8;
+ - COMPILER=gcc; LCG_RELEASE=KEY4HEP_STACK; STANDARD=17; COMPILER_VERSION=gcc8;
before_install:
- wget --no-check-certificate https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb
@@ -25,7 +26,7 @@ before_install:
- echo "CVMFS_HTTP_PROXY=DIRECT" | sudo tee -a /etc/cvmfs/default.local > /dev/null
- echo "CVMFS_CACHE_BASE='/var/lib/cvmfs'" | sudo tee -a /etc/cvmfs/default.local > /dev/null
- echo "CVMFS_FORCE_SIGNING='yes'" | sudo tee -a /etc/cvmfs/default.local > /dev/null
- - echo "CVMFS_REPOSITORIES='sft.cern.ch,sw-nightlies.hsf.org,cepcsw.ihep.ac.cn,container.ihep.ac.cn'" | sudo tee -a /etc/cvmfs/default.local > /dev/null
+ - echo "CVMFS_REPOSITORIES='sft.cern.ch,sft-nightlies.cern.ch,sw.hsf.org,sw-nightlies.hsf.org,cepcsw.ihep.ac.cn,container.ihep.ac.cn'" | sudo tee -a /etc/cvmfs/default.local > /dev/null
- echo "CVMFS_SEND_INFO_HEADER=no" | sudo tee -a /etc/cvmfs/default.local > /dev/null
- cat /etc/cvmfs/default.local
- # change wrt dd4hep setup: don't manually mount cvmfs folders
@@ -35,11 +36,14 @@ before_install:
- sudo mkdir -p /cvmfs/sft.cern.ch
- sudo mkdir -p /cvmfs/sft-nightlies.cern.ch
- sudo mkdir -p /cvmfs/geant4.cern.ch
+ - sudo mkdir -p /cvmfs/sw.hsf.org
- sudo mkdir -p /cvmfs/sw-nightlies.hsf.org
- sudo mkdir -p /cvmfs/cepcsw.ihep.ac.cn
- sudo mkdir -p /cvmfs/container.ihep.ac.cn
- ls /cvmfs/sft.cern.ch
+ - ls /cvmfs/sft-nightlies.cern.ch
- ls /cvmfs/geant4.cern.ch
+ - ls /cvmfs/sw.hsf.org
- ls /cvmfs/sw-nightlies.hsf.org
- ls /cvmfs/cepcsw.ihep.ac.cn
- ls /cvmfs/container.ihep.ac.cn
--
GitLab