зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1289249 - Use vendored tooltool.py in SpiderMonkey tasks; r=dustin
Previously, SpiderMonkey tasks were using tc-vcs to clone the tooltool repository so they could have access to tooltool.py. tooltool.py is already in the execution environment courtesy of being part of the source checkout. So use it from there. One less dependency on a 3rd party service at run-time. One less point for a MITM attack against our automation. MozReview-Commit-ID: JmavaBG4vii --HG-- extra : rebase_source : 5f6c56d1398268ceba867bb47645281465949246
This commit is contained in:
Родитель
71611a56fe
Коммит
110de002ce
|
@ -3,8 +3,6 @@
|
||||||
set -xe
|
set -xe
|
||||||
|
|
||||||
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
|
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
|
||||||
: ${TOOLTOOL_REPO:=https://github.com/mozilla/build-tooltool}
|
|
||||||
: ${TOOLTOOL_REV:=master}
|
|
||||||
: ${SPIDERMONKEY_VARIANT:=plain}
|
: ${SPIDERMONKEY_VARIANT:=plain}
|
||||||
: ${UPLOAD_DIR:=$HOME/artifacts/}
|
: ${UPLOAD_DIR:=$HOME/artifacts/}
|
||||||
: ${WORK:=$HOME/workspace}
|
: ${WORK:=$HOME/workspace}
|
||||||
|
@ -49,5 +47,4 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS
|
||||||
: ${TOOLTOOL_CHECKOUT:=$WORK}
|
: ${TOOLTOOL_CHECKOUT:=$WORK}
|
||||||
export TOOLTOOL_CHECKOUT
|
export TOOLTOOL_CHECKOUT
|
||||||
|
|
||||||
tc-vcs checkout $TOOLTOOL_CHECKOUT/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
|
(cd $TOOLTOOL_CHECKOUT && python ${SRCDIR}/testing/docker/recipes/tooltool.py --url $TOOLTOOL_SERVER -m $SRCDIR/$TOOLTOOL_MANIFEST fetch ${TOOLTOOL_CACHE:+ -c $TOOLTOOL_CACHE})
|
||||||
(cd $TOOLTOOL_CHECKOUT && python tooltool/tooltool.py --url $TOOLTOOL_SERVER -m $SRCDIR/$TOOLTOOL_MANIFEST fetch ${TOOLTOOL_CACHE:+ -c $TOOLTOOL_CACHE})
|
|
||||||
|
|
|
@ -67,8 +67,6 @@ def docker_worker_spidermonkey(config, job, taskdesc, schema=sm_run_schema):
|
||||||
'mount-point': '/home/worker/tooltool-cache',
|
'mount-point': '/home/worker/tooltool-cache',
|
||||||
})
|
})
|
||||||
env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'
|
env['TOOLTOOL_CACHE'] = '/home/worker/tooltool-cache'
|
||||||
env['TOOLTOOL_REPO'] = 'https://github.com/mozilla/build-tooltool'
|
|
||||||
env['TOOLTOOL_REV'] = 'master'
|
|
||||||
if run.get('tooltool-manifest'):
|
if run.get('tooltool-manifest'):
|
||||||
env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
|
env['TOOLTOOL_MANIFEST'] = run['tooltool-manifest']
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче