From 7af689247ff12fea9ecc9b39f77176bdf47c77f7 Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Wed, 18 Mar 2015 23:32:27 -0400
Subject: [PATCH] Change systemtests to rhel7
---
Code/Mantid/Build/Jenkins/buildscript | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
index 40f6003fab6..bf9df07b223 100755
--- a/Code/Mantid/Build/Jenkins/buildscript
+++ b/Code/Mantid/Build/Jenkins/buildscript
@@ -85,6 +85,10 @@ else
SCL_ON_RHEL6="eval"
fi
+if [[ ${NODE_LABELS} == *rhel7* ]]; then
+ ON_RHEL7=true
+fi
+
###############################################################################
# Check job requirements from the name
###############################################################################
@@ -212,6 +216,6 @@ fi
# Run the system tests on RHEL6 when doing a pull request build. Run
# from a package to have at least one Linux checks it install okay
###############################################################################
-if [[ "${ON_RHEL6}" == true ]] && [[ ${JOB_NAME} == *pull_requests* ]]; then
+if [[ "${ON_RHEL7}" == true ]] && [[ ${JOB_NAME} == *pull_requests* ]]; then
$SCRIPT_DIR/systemtests
fi
--
GitLab