Bug 1296150 - Obtain tooltool from github.com; r?RyanVM
This is effectively a graft of 13fa96518284 (
bug 1277957). I had to
make the changes manually since there were a lot of file renames
and refactoring between central and beta.
I'm not a fan of relying on github.com in our release automation.
I've been actively vendoring things to not rely on external services.
I have
bug 1296148 on file to track removing references to github.com
from our automation. But with git.mozilla.org now offline, we can
either bite the bullet and connect to github.com (like our aurora
and central automation currently do) or do an invasive refactor
to vendor tooltool in beta. I'm inclined to let the eventual fixes
to stop relying on github.com to ride the trains.
MozReview-Commit-ID: IY9IxQkL7a6
--- a/testing/taskcluster/scripts/builder/build-haz-linux.sh
+++ b/testing/taskcluster/scripts/builder/build-haz-linux.sh
@@ -17,17 +17,17 @@ shift
SCRIPT_FLAGS="$*"
# Use GECKO_BASE_REPOSITORY as a signal for whether we are running in automation.
export AUTOMATION=${GECKO_BASE_REPOSITORY:+1}
: ${GECKO_DIR:=$WORKSPACE/gecko}
: ${TOOLTOOL_MANIFEST:=browser/config/tooltool-manifests/linux64/hazard.manifest}
: ${TOOLTOOL_CACHE:=$WORKSPACE/tt-cache}
-: ${TOOLTOOL_REPO:=https://git.mozilla.org/build/tooltool.git}
+: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool.git}
if ! [ -d $GECKO_DIR ]; then
echo "GECKO_DIR must be set to a directory containing a gecko source checkout" >&2
exit 1
fi
GECKO_DIR=$( cd "$GECKO_DIR" && pwd )
# Directory to populate with tooltool-installed tools
--- a/testing/taskcluster/scripts/builder/sm-tooltool-config.sh
+++ b/testing/taskcluster/scripts/builder/sm-tooltool-config.sh
@@ -1,14 +1,14 @@
#!/bin/bash
set -xe
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
-: ${TOOLTOOL_REPO:=https://git.mozilla.org/build/tooltool.git}
+: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool.git}
: ${TOOLTOOL_REV:=master}
: ${SPIDERMONKEY_VARIANT:=plain}
: ${UPLOAD_DIR:=$HOME/artifacts/}
: ${WORK:=$HOME/workspace}
: ${SRCDIR:=$WORK/build/src}
mkdir -p $WORK
cd $WORK
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -41,17 +41,17 @@ task:
env:
# Common environment variables for checking out gecko
GECKO_BASE_REPOSITORY: '{{base_repository}}'
GECKO_HEAD_REPOSITORY: '{{head_repository}}'
GECKO_HEAD_REV: '{{head_rev}}'
GECKO_HEAD_REF: '{{head_ref}}'
- TOOLTOOL_REPO: 'https://git.mozilla.org/build/tooltool.git'
+ TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool.git'
TOOLTOOL_REV: 'master'
MOZ_BUILD_DATE: '{{pushdate}}'
MOZ_SCM_LEVEL: '{{level}}'
extra:
build_product: '{{build_product}}'
build_name: '{{build_name}}'
build_type: '{{build_type}}'
--- a/testing/taskcluster/tasks/harness_test.yml
+++ b/testing/taskcluster/tasks/harness_test.yml
@@ -44,17 +44,17 @@ task:
- bash
- /home/worker/bin/build.sh
env:
# Common environment variables for checking out gecko
GECKO_BASE_REPOSITORY: '{{base_repository}}'
GECKO_HEAD_REPOSITORY: '{{head_repository}}'
GECKO_HEAD_REV: '{{head_rev}}'
GECKO_HEAD_REF: '{{head_ref}}'
- TOOLTOOL_REPO: 'https://git.mozilla.org/build/tooltool.git'
+ TOOLTOOL_REPO: 'https://github.com/mozilla/build-tooltool.git'
TOOLTOOL_REV: 'master'
TOOLS_DISABLE: true
MOZ_BUILD_DATE: '{{pushdate}}'
MOZ_SCM_LEVEL: '{{level}}'
extra:
# These definitions are expected of build tasks but not used in our case
build_product: '{{build_product}}'