From 7bced0b89e96225e1185afe242836e867084a402 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <attila.krasznahorkay@cern.ch>
Date: Sat, 7 Dec 2019 16:47:29 +0000
Subject: [PATCH] Revert "Merge branch
'ExternalsAndBuildUpdate-master-20191205' into 'master'"
This reverts merge request !28548
---
Projects/AnalysisBase/externals.txt | 2 +-
Projects/AnalysisTop/externals.txt | 2 +-
Projects/AthDataQuality/externals.txt | 2 +-
Projects/AthSimulation/build_externals.sh | 19 +++++--------------
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/build_externals.sh | 19 +++++--------------
Projects/Athena/externals.txt | 2 +-
Projects/VP1Light/externals.txt | 2 +-
8 files changed, 16 insertions(+), 34 deletions(-)
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 84e6d32ac2a..e2bad52dc1c 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.47
+AnalysisBaseExternalsVersion = 2.0.45
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index a28fb964478..c73c82e7411 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
# Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build.
-AnalysisBaseExternalsVersion = 2.0.47
+AnalysisBaseExternalsVersion = 2.0.45
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index a02b30559df..c90085796f9 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.47
+AtlasExternalsVersion = 2.0.45
diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh
index 63b9fee3d29..1548b155d9b 100755
--- a/Projects/AthSimulation/build_externals.sh
+++ b/Projects/AthSimulation/build_externals.sh
@@ -57,12 +57,9 @@ while getopts ":t:b:x:fch" opt; do
esac
done
-# Only stop on errors if we are in the CI. Otherwise just count them.
-if [ "$CI" = "1" ]; then
- set -e
- set -o pipefail
-fi
-ERROR_COUNT=0
+# Stop on errors from here on out:
+set -e
+set -o pipefail
# We are in BASH, get the path of this script in a simple way:
thisdir=$(dirname ${BASH_SOURCE[0]})
@@ -121,7 +118,7 @@ ${scriptsdir}/build_atlasexternals.sh \
-b ${BUILDDIR}/build/AthSimulationExternals \
-i ${BUILDDIR}/install/AthSimulationExternals/${NICOS_PROJECT_VERSION} \
-p AthSimulationExternals ${RPMOPTIONS} -t ${BUILDTYPE} \
- ${EXTRACMAKE[@]/#/-x } -v ${NICOS_PROJECT_VERSION} || ((ERROR_COUNT++))
+ ${EXTRACMAKE[@]/#/-x } -v ${NICOS_PROJECT_VERSION}
# Get the "platform name" from the directory created by the AthSimulationExternals
# build:
@@ -143,10 +140,4 @@ ${scriptsdir}/build_Gaudi.sh \
-i ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION} \
-e ${BUILDDIR}/install/AthSimulationExternals/${NICOS_PROJECT_VERSION}/InstallArea/${platform} \
-p AthSimulationExternals -f ${platform} ${EXTRACMAKE[@]/#/-x } \
- ${RPMOPTIONS} -t ${BUILDTYPE} || ((ERROR_COUNT++))
-
-# Exit with the error count taken into account.
-if [ ${ERROR_COUNT} -ne 0 ]; then
- echo "AthSimulation externals build encountered ${ERROR_COUNT} error(s)"
-fi
-exit ${ERROR_COUNT}
+ ${RPMOPTIONS} -t ${BUILDTYPE}
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index c5c14fdd651..e039ebe88d5 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.47
+AthSimulationExternalsVersion = 2.0.45
# The version of atlas/Gaudi to use:
GaudiVersion = v32r2.003
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index 38ff7afb434..01404b17391 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -57,12 +57,9 @@ while getopts ":t:b:x:fch" opt; do
esac
done
-# Only stop on errors if we are in the CI. Otherwise just count them.
-if [ "$CI" = "1" ]; then
- set -e
- set -o pipefail
-fi
-ERROR_COUNT=0
+# Stop on errors from here on out
+set -e
+set -o pipefail
# We are in BASH, get the path of this script in a simple way:
thisdir=$(dirname ${BASH_SOURCE[0]})
@@ -146,7 +143,7 @@ ${scriptsdir}/build_atlasexternals.sh \
-i ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION} \
-p AthenaExternals ${RPMOPTIONS} -t ${BUILDTYPE} \
-v ${NICOS_PROJECT_VERSION} \
- ${EXTRACMAKE[@]/#/-x } || ((ERROR_COUNT++))
+ ${EXTRACMAKE[@]/#/-x }
{
test "X${NIGHTLY_STATUS}" != "X" && {
@@ -185,7 +182,7 @@ ${scriptsdir}/build_Gaudi.sh \
-i ${BUILDDIR}/install/GAUDI/${NICOS_PROJECT_VERSION} \
-e ${BUILDDIR}/install/AthenaExternals/${NICOS_PROJECT_VERSION}/InstallArea/${platform} \
-p AthenaExternals -f ${platform} ${RPMOPTIONS} -t ${BUILDTYPE} \
- ${EXTRACMAKE[@]/#/-x } || ((ERROR_COUNT++))
+ ${EXTRACMAKE[@]/#/-x }
{
test "X${NIGHTLY_STATUS}" != "X" && {
@@ -195,9 +192,3 @@ ${scriptsdir}/build_Gaudi.sh \
)
} || true
}
-
-# Exit with the error count taken into account.
-if [ ${ERROR_COUNT} -ne 0 ]; then
- echo "Athena externals build encountered ${ERROR_COUNT} error(s)"
-fi
-exit ${ERROR_COUNT}
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index bf1f6f1bf85..2eccb972424 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.47
+AthenaExternalsVersion = 2.0.45
# The version of atlas/Gaudi to use:
GaudiVersion = v32r2.003
diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt
index c6d19c9cad8..ca2c4b2aaa5 100644
--- a/Projects/VP1Light/externals.txt
+++ b/Projects/VP1Light/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.47
+VP1LightExternalsVersion = 2.0.45
--
GitLab