Merge pull request #2373 from cms-sw/unify-real-arch

Unify REAL_ARCH for PR/baseline relvals

cms_static.py

@@ -15,6 +15,7 @@
 JENKINS_HOST = "cmsjenkins04"
 CMS_JENKINS_HOST = "cmsjenkins02"
 DMWM_JENKINS_HOST = "cmsjenkins11"
+RELVAL_REAL_ARCH = "-GenuineIntel"
 VALID_CMS_SW_REPOS_FOR_TESTS = [
     "cmssw",
     "cmsdist",

cmsrep.sh

@@ -3,6 +3,7 @@ CMSREP_IB_SERVER=cmsrep.cern.ch
 CMSBUILD_OPTS_FILE="etc/build_options.sh"
 BUILD_OPTS=""
 MULTIARCH_OPTS=""
+RELVAL_REAL_ARCH="-GenuineIntel"
 umask 0002
 export CMS_PYTHON_TO_USE="python"
 if which python3 >/dev/null 2>&1 ; then export CMS_PYTHON_TO_USE="python3" ; fi

logRootQA.py

@@ -325,7 +325,7 @@ def summaryComp(compDir):
 # one way to set up for local tests..
 # login to ssh cmssdt server (see CMSSDT_SERVER in ./cmssdt.sh for server name)
 # copy out data from a recent pull request comparison
-# cd /data/sdt/SDT/jenkins-artifacts/ib-baseline-tests/CMSSW_10_0_X_2017-11-05-2300/slc6_amd64_gcc630/-GenuineIntel
+# cd /data/sdt/SDT/jenkins-artifacts/ib-baseline-tests/CMSSW_10_0_X_2017-11-05-2300/slc6_amd64_gcc630/${REAL_ARCH}
 # scp -r matrix-results/ dlange@cmsdev01:/build/dlange/171103/t1/
 # cd ../../../../pull-request-integration/PR-21181/24200/
 # scp -r runTheMatrix-results/ dlange@cmsdev01:/build/dlange/171103/t1/.

pr_testing/run-pr-comparisons

@@ -77,7 +77,7 @@ JR_COMP_DIR=$WORKSPACE/results/JR-comparison
 mkdir -p $WORKSPACE/upload ${JR_COMP_DIR} $WORKSPACE/data
 rm -f $WORKSPACE/ALL_DONE
 if [ "X$COMPARISON_RELEASE" = "X" ] ; then COMPARISON_RELEASE=$CMSSW_VERSION; fi
-if [ "$REAL_ARCH" = "" ] ; then REAL_ARCH="-GenuineIntel"; fi
+if [ "$REAL_ARCH" = "" ] ; then REAL_ARCH="${RELVAL_REAL_ARCH}"; fi
 PR_NUM=$(echo ${PULL_REQUEST} | md5sum | sed 's| .*||' | cut -c27-33)
 BASELINE_DIR=ib-baseline-tests/$COMPARISON_RELEASE/$COMPARISON_ARCH/$REAL_ARCH/matrix${TEST_FLAVOR}-results
 PR_BASELINE_JOBDIR=pull-request-integration/${UPLOAD_UNIQ_ID}

pr_testing/test_multiple_prs.sh

@@ -312,6 +312,7 @@ if $DO_COMPARISON ; then
     echo "ARCHITECTURE=$COMPARISON_ARCH" >> run-baseline-${BUILD_ID}-01.default
     echo "DOCKER_IMG=cmssw/${COMP_OS}"   >> run-baseline-${BUILD_ID}-01.default
     echo "TEST_FLAVOR="                  >> run-baseline-${BUILD_ID}-01.default
+    echo "REAL_ARCH=${RELVAL_REAL_ARCH}" >> run-baseline-${BUILD_ID}-01.default
     echo "PRODUCTION_RELEASE=${PRODUCTION_RELEASE}" >> run-baseline-${BUILD_ID}-01.default
     WF_LIST=$(get_pr_baseline_worklflow)
     [ "${WF_LIST}" = "" ] || WF_LIST="-l ${WF_LIST}"
@@ -1397,6 +1398,7 @@ if [ "X$DO_SHORT_MATRIX" = Xtrue ]; then
   echo "MATRIX_TIMEOUT=$MATRIX_TIMEOUT" >> $WORKSPACE/run-relvals.prop
   echo "COMPARISON_REL=${COMPARISON_REL}" >> $WORKSPACE/run-relvals.prop
   echo "COMPARISON_ARCH=${COMPARISON_ARCH}" >> $WORKSPACE/run-relvals.prop
+  echo "REAL_ARCH=${RELVAL_REAL_ARCH}" >> $WORKSPACE/run-relvals.prop
   WF_COMMON="-s $(get_pr_relval_args $DO_COMPARISON '')"
   [ "${WORKFLOWS_PR_LABELS}" != "" ] && WF_COMMON="${WF_COMMON};-l ${WORKFLOWS_PR_LABELS}"
   echo "MATRIX_ARGS=${WF_COMMON}" >> $WORKSPACE/run-relvals.prop

report-summary-merged-prs.py

@@ -15,7 +15,7 @@
 
 from cmsutils import get_config_map_properties
 from github_utils import get_merge_prs
-from cms_static import GH_CMSSW_REPO, GH_CMSSW_ORGANIZATION
+from cms_static import GH_CMSSW_REPO, GH_CMSSW_ORGANIZATION, RELVAL_REAL_ARCH
 from releases import CMSSW_DEVEL_BRANCH
 from socket import setdefaulttimeout
 
@@ -1757,17 +1757,19 @@ def fix_results(results):
     MAGIC_COMMAND_FIND_COMPARISON_BASELINE = (
         "test -f "
         + JENKINS_ARTIFACTS_DIR
-        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/-GenuineIntel/matrix-results/wf_errors.txt"
+        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/%s/matrix-results/wf_errors.txt"
+        % RELVAL_REAL_ARCH
     )
     MAGIC_COMMAND_COMPARISON_BASELINE_ERRORS = (
         "cat "
         + JENKINS_ARTIFACTS_DIR
-        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/-GenuineIntel/matrix-results/wf_errors.txt"
+        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/%s/matrix-results/wf_errors.txt"
+        % RELVAL_REAL_ARCH
     )
     COMPARISON_BASELINE_TESTS_URL = (
         "https://cmssdt.cern.ch/"
         + JENKINS_ARTIFACTS_SUBDIR
-        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/-GenuineIntel/matrix-results"
+        + "/ib-baseline-tests/RELEASE_NAME/ARCHITECTURE/%s/matrix-results" % RELVAL_REAL_ARCH
     )
     CHECK_HLT_PATH = (
         JENKINS_ARTIFACTS_DIR + "/HLT-Validation/RELEASE_NAME/ARCHITECTURE/jenkins.log"

schedule-additional-tests

@@ -1,4 +1,5 @@
 #!/bin/bash -ex
+source $(dirname $0)/cmsrep.sh
 CONFIG_MAP=$(dirname $0)/config.map
 PROFILING_WORKFLOWS=$($CMS_BOT_DIR/cmssw-pr-test-config _PROFILING | tr ',' ' ')
 for x in `grep ADDITIONAL_TESTS=  $CONFIG_MAP | grep "SCRAM_ARCH=$ARCHITECTURE;" | grep "RELEASE_QUEUE=$RELEASE_QUEUE;" | sed -e's/.*ADDITIONAL_TESTS=//;s/;.*//' | tr , '\n'`; do
@@ -17,7 +18,7 @@ for x in `grep ADDITIONAL_TESTS=  $CONFIG_MAP | grep "SCRAM_ARCH=$ARCHITECTURE;"
   fi
   echo "ADDITIONAL_TEST_NAME=$x" >> ${pfile}
   if [ "$x" == "baseline" ]; then
-    echo "REAL_ARCH=-GenuineIntel" >> ${pfile}
+    echo "REAL_ARCH=${RELVAL_REAL_ARCH}" >> ${pfile}
   fi
   if [ "$x" = "igprof-pp" -o  "$x" = "igprof-mp"  ] ; then
     prof=$(echo $x | sed 's|igprof-||')