From 4f30ef5aaefac7c6c905f85b47ff0971a0536bfa Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Wed, 7 Mar 2018 16:07:30 +0100
Subject: [PATCH] if more than one release cycle found then use normal release
 flavors

---
 pr-schedule-tests           | 3 +++
 report-pull-request-results | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pr-schedule-tests b/pr-schedule-tests
index 2dae36b09f4e..b67f1ba42651 100755
--- a/pr-schedule-tests
+++ b/pr-schedule-tests
@@ -31,6 +31,9 @@ else
   CMSDIST_BRANCH=$(echo $GH_JSON | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["base"]["ref"]')
   if [ $(cat $CMS_BOT_DIR/config.map | grep -v 'NO_IB=' | grep -v 'DISABLED=1;' | grep "CMSDIST_TAG=${CMSDIST_BRANCH};" | wc -l) -gt 1 ] ; then
     MLINES=$(cat $CMS_BOT_DIR/config.map | grep -v 'NO_IB='| grep -v 'DISABLED=1;' | grep "CMSDIST_TAG=${CMSDIST_BRANCH};" | grep "PR_TESTS=1")
+    if [ $(echo $MLINES | tr ';' '\n' | grep SCRAM_ARCH= | wc -l) -gt 1 ] ; then
+      MLINES=$(cat $CMS_BOT_DIR/config.map | grep -v 'NO_IB='| grep -v 'DISABLED=1;' | grep "CMSDIST_TAG=${CMSDIST_BRANCH};" | grep "PR_TESTS=1" | grep 'RELEASE_QUEUE=CMSSW_[0-9][0-9]*_[0-9][0-9]*_X')
+    fi
   else
     MLINES=$(cat $CMS_BOT_DIR/config.map | grep -v 'NO_IB='| grep -v 'DISABLED=1;' | grep "CMSDIST_TAG=${CMSDIST_BRANCH};")
   fi
diff --git a/report-pull-request-results b/report-pull-request-results
index 18ccc1b7805d..3d193316ed14 100755
--- a/report-pull-request-results
+++ b/report-pull-request-results
@@ -1,5 +1,5 @@
 #!/bin/bash
-eval $(scram unset -sh)
+eval $(scram unset -sh) || true
 for x in 0 1 2 ; do
   $(dirname $0)/report-pull-request-results.py "$@" && exit 0
   sleep 30