Bug 1468770 - repo-update submitter and commit msg. r=RyanVM, a=release FIREFOX_60_1_0esr_BUILD2 FIREFOX_60_1_0esr_RELEASE
authorSimon Fraser <sfraser@mozilla.com>
Tue, 19 Jun 2018 13:01:54 +0000
changeset 449553 4ad4c31db9b1526aab8641be98fec8e0d63a4a7e
parent 449552 effd37566c79242e4662e3c1c01167822ebf74f7
child 449554 c223777b7899293b19a83b745f4c7b7a9a59fd9f
push id98
push userjcristau@mozilla.com
push dateThu, 21 Jun 2018 12:16:04 +0000
treeherdermozilla-esr60@4ad4c31db9b1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM, release
bugs1468770
milestone60.1.0
Bug 1468770 - repo-update submitter and commit msg. r=RyanVM, a=release Differential Revision: https://phabricator.services.mozilla.com/D1700
taskcluster/docker/periodic-updates/runme.sh
taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
--- a/taskcluster/docker/periodic-updates/runme.sh
+++ b/taskcluster/docker/periodic-updates/runme.sh
@@ -70,9 +70,9 @@ then
   }
 }
 END
   set -x
   chmod 600 "${HOME}/.arcrc"
 fi
 
 # shellcheck disable=SC2086
-/home/worker/scripts/periodic_file_updates.sh -p "${PRODUCT}" -b "${BRANCH}" ${PARAMS}
+/home/worker/scripts/periodic_file_updates.sh -p "${PRODUCT}" -b "${BRANCH}" -a ${PARAMS}
--- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
+++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
@@ -22,17 +22,17 @@ EOF
 
 PRODUCT="firefox"
 BRANCH=""
 PLATFORM_EXT="tar.bz2"
 UNPACK_CMD="tar jxf"
 CLOSED_TREE=false
 DONTBUILD=false
 APPROVAL=false
-HG_SSH_USER='ffxbld'
+COMMIT_AUTHOR='ffxbld@mozilla.com'
 REPODIR=''
 APP_DIR=''
 APP_ID=''
 APP_NAME=''
 HGHOST="hg.mozilla.org"
 STAGEHOST="archive.mozilla.org"
 WGET="wget -nv"
 UNZIP="unzip -q"
@@ -396,17 +396,17 @@ function push_repo {
   fi
   if [ -z "${REVIEWERS}" ]
   then
     return 1
   fi
   # Clean up older review requests
   # Turn  Needs Review D624: No bug, Automated HSTS ...
   # into D624
-  for diff in $($ARC list | grep "Needs Review" | grep -E "Automated HSTS|Automated HPKP|Automated blocklist" | awk 'match($0, /D[0-9]+[^: ]/) { print substr($0, RSTART, RLENGTH)  }')
+  for diff in $($ARC list | grep "Needs Review" | grep -E "${BRANCH} repo-update" | awk 'match($0, /D[0-9]+[^: ]/) { print substr($0, RSTART, RLENGTH)  }')
   do
     echo "Removing old request $diff"
     # There is no 'arc abandon', see bug 1452082
     echo '{"transactions": [{"type":"abandon"}], "objectIdentifier": "'"${diff}"'"}' | arc call-conduit differential.revision.edit
   done
 
   $ARC diff --verbatim --reviewers "${REVIEWERS}"
 }
@@ -592,14 +592,14 @@ fi
 if [ ${CLOSED_TREE} == true ]; then
   COMMIT_MESSAGE="${COMMIT_MESSAGE} - CLOSED TREE"
 fi
 if [ ${APPROVAL} == true ]; then
   COMMIT_MESSAGE="${COMMIT_MESSAGE} - a=repo-update"
 fi
 
 
-if ${HG} -R "${REPODIR}" commit -u "${HG_SSH_USER}" -m "${COMMIT_MESSAGE}"
+if ${HG} -R "${REPODIR}" commit -u "${COMMIT_AUTHOR}" -m "${COMMIT_MESSAGE}"
 then
   push_repo
 fi
 
 echo "All done"