Bug 1289249 - Extract tooltool_fetch to its own shell script; r=dustin

I will add more stuff to common.sh in the future in order to justify
its existence. Not in this bug though.

MozReview-Commit-ID: Lx7MJwBMH0w

--HG--
extra : rebase_source : fe6f51a9b6910abd9dedfda54c0bc8ebd3c3551e
This commit is contained in:
Gregory Szorc 2016-09-28 21:45:25 -07:00
Родитель 2df70dad2c
Коммит c78fa369fd
3 изменённых файлов: 14 добавлений и 7 удалений

Просмотреть файл

@ -10,6 +10,9 @@ ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
# %include testing/mozharness/external_tools/robustcheckout.py
ADD topsrcdir/testing/mozharness/external_tools/robustcheckout.py /usr/local/mercurial/robustcheckout.py
# %include testing/docker/recipes/common.sh
ADD topsrcdir/testing/docker/recipes/common.sh /setup/common.sh
# %include testing/docker/recipes/install-mercurial.sh
ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh

Просмотреть файл

@ -0,0 +1,10 @@
#!/bin/bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
tooltool_fetch() {
cat >manifest.tt
python /setup/tooltool.py fetch
rm manifest.tt
}

Просмотреть файл

@ -90,13 +90,7 @@ apt-get install -y -f ${apt_packages[@]}
dpkg-reconfigure locales
# set up tooltool (temporarily)
tooltool_fetch() {
cat >manifest.tt
python /setup/tooltool.py fetch
rm manifest.tt
}
. /setup/common.sh
. /setup/install-mercurial.sh
pip install --upgrade pip