Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1492664 - update periodic-updates to use TASKCLUSTER_ROOT_URL; r=sfraser

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14218

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dustin J. Mitchell 2018-12-18 17:26:09 +00:00
parent 5399564f96
commit 50e036e7ce
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
taskcluster/docker/periodic-updates/runme.sh
View File

@ -51,18 +51,25 @@ fi
export ARTIFACTS_DIR="/home/worker/artifacts"
mkdir -p "$ARTIFACTS_DIR"
# duplicate the functionality of taskcluster-lib-urls, but in bash..
if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
queue_base='https://queue.taskcluster.net/v1'
else
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
fi
# Get Arcanist API token
if [ -n "${TASK_ID}" ]
then
curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json \
"https://queue.taskcluster.net/v1/task/$TASK_ID"
curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json "$queue_base/task/$TASK_ID"
ARC_SECRET=$(jq -r '.scopes[] | select(contains ("arc-phabricator-token"))' /home/worker/task.json | awk -F: '{print $3}')
fi
if [ -n "${ARC_SECRET}" ] && getent hosts taskcluster
then
set +x # Don't echo these
secrets_url="http://taskcluster/secrets/v1/secret/${ARC_SECRET}"
# Until bug 1460015 is finished, use baseUrl-style proxy URLs
secrets_url="${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/${ARC_SECRET}"
SECRET=$(curl "${secrets_url}")
TOKEN=$(echo "${SECRET}" | jq -r '.secret.token')
elif [ -n "${ARC_TOKEN}" ] # Allow for local testing.

21
taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
View File

@ -95,6 +95,15 @@ BLOCKLIST_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${BLOCKLIST_DIFF_ARTIFACT:-"blocklist.
REMOTE_SETTINGS_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${REMOTE_SETTINGS_DIFF_ARTIFACT:-"remote-settings.diff"}"
SUFFIX_LIST_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${SUFFIX_LIST_DIFF_ARTIFACT:-"effective_tld_names.diff"}"
# duplicate the functionality of taskcluster-lib-urls, but in bash..
if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
queue_base='https://queue.taskcluster.net/v1'
index_base='https://index.taskcluster.net/v1'
else
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
index_base="$TASKCLUSTER_ROOT_URL/api/index/v1"
fi
# Get the current in-tree version for a code branch.
function get_version {
VERSION_REPO=$1
@ -146,11 +155,11 @@ function download_shared_artifacts_from_tc {
# Download everything we need to run js with xpcshell
echo "INFO: Downloading all the necessary pieces from the taskcluster index..."
TASKID_URL="https://index.taskcluster.net/v1/task/gecko.v2.${REPODIR}.latest.${PRODUCT}.linux64-opt"
TASKID_URL="$index_base/task/gecko.v2.${REPODIR}.latest.${PRODUCT}.linux64-opt"
if [ "${USE_MC}" == "true" ]; then
TASKID_URL="https://index.taskcluster.net/v1/task/gecko.v2.mozilla-central.latest.${PRODUCT}.linux64-opt"
TASKID_URL="$index_base/task/gecko.v2.mozilla-central.latest.${PRODUCT}.linux64-opt"
fi
${WGET} -O ${TASKID_FILE} ${TASKID_URL}
${WGET} -O ${TASKID_FILE} "${TASKID_URL}"
INDEX_TASK_ID="$($JQ -r '.taskId' ${TASKID_FILE})"
if [ -z "${INDEX_TASK_ID}" ]; then
echo "Failed to look up taskId at ${TASKID_URL}"
@ -160,16 +169,16 @@ function download_shared_artifacts_from_tc {
fi
TASKSTATUS_FILE="taskstatus.json"
STATUS_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/status"
STATUS_URL="$queue_base/task/${INDEX_TASK_ID}/status"
${WGET} -O "${TASKSTATUS_FILE}" "${STATUS_URL}"
LAST_RUN_INDEX=$(($(jq '.status.runs | length' ${TASKSTATUS_FILE}) - 1))
echo "INFO: Examining run number ${LAST_RUN_INDEX}"
BROWSER_ARCHIVE_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${BROWSER_ARCHIVE}"
BROWSER_ARCHIVE_URL="$queue_base/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${BROWSER_ARCHIVE}"
echo "INFO: ${WGET} ${BROWSER_ARCHIVE_URL}"
${WGET} "${BROWSER_ARCHIVE_URL}"
TESTS_ARCHIVE_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${TESTS_ARCHIVE}"
TESTS_ARCHIVE_URL="$queue_base/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${TESTS_ARCHIVE}"
echo "INFO: ${WGET} ${TESTS_ARCHIVE_URL}"
${WGET} "${TESTS_ARCHIVE_URL}"
}