for master branch return the release queue

cms-sw · Feb 20, 2017 · ac81e63 · ac81e63
1 parent 09c0718
commit ac81e63
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/get-pr-branch b/get-pr-branch
@@ -21,4 +21,9 @@ if __name__ == "__main__":
     print ex
     exit(1)
 
-  print pr.base.ref
+  if pr.base.ref == "master":
+    from commands import getstatusoutput
+    e, o = getstatusoutput("grep ';RELEASE_BRANCH=master;' %s | sed 's|.*;RELEASE_QUEUE=||;s|;.*||'" % args.number[1])
+    print o
+  else:
+    print pr.base.ref
diff --git a/pr-schedule-tests b/pr-schedule-tests
@@ -11,7 +11,7 @@ PROP_FILE=properties-pr
 if [ "X$PULL_REQUEST" != "X" ] ; then
   OUTPUT_FILE=${PROP_FILE}-${PULL_REQUEST}-${SCRAM_ARCH}.txt
   # Use helper to get PR branch
-  RELEASE_QUEUE=`$CMS_BOT_DIR/get-pr-branch $PULL_REQUEST`
+  RELEASE_QUEUE=`$CMS_BOT_DIR/get-pr-branch $PULL_REQUEST $CMS_BOT_DIR/config.map`
   CONFIG_MAP_FILE="$CMS_BOT_DIR/config.map"
 
   COMP_QUEUE=$(echo $RELEASE_QUEUE | sed 's|^\(CMSSW_[0-9]*_[0-9]*\)_.*|\1_X|')

diff --git a/run-pr-tests b/run-pr-tests
@@ -92,7 +92,7 @@ if [ ! -d CMSSW_* ]; then
       fi
     fi
   else
-    RELEASE_QUEUE=`$CMS_BOT_DIR/get-pr-branch $PULL_REQUEST`
+    RELEASE_QUEUE=`$CMS_BOT_DIR/get-pr-branch $PULL_REQUEST $CMS_BOT_DIR/config.map`
   fi
 else
   RELEASE_FORMAT=$( find $WORKSPACE -maxdepth 1 -name "CMSSW_*" -printf '%f\n' )