mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
Bug 1394883: use /builds/worker in decision images; r=wcosta
MozReview-Commit-ID: 29cnSAr3zCW --HG-- extra : rebase_source : dab573ee114729822c5ad9bd2674062f7ee24502
This commit is contained in:
parent
2e7ca17010
commit
16488779cd
@ -72,11 +72,11 @@ tasks:
|
||||
GECKO_HEAD_REF: '${push.revision}'
|
||||
GECKO_HEAD_REV: '${push.revision}'
|
||||
GECKO_COMMIT_MSG: '${push.comment}'
|
||||
HG_STORE_PATH: /home/worker/checkouts/hg-store
|
||||
TASKCLUSTER_CACHES: /home/worker/checkouts
|
||||
HG_STORE_PATH: /builds/worker/checkouts/hg-store
|
||||
TASKCLUSTER_CACHES: /builds/worker/checkouts
|
||||
|
||||
cache:
|
||||
level-${repository.level}-checkouts-sparse-v1: /home/worker/checkouts
|
||||
level-${repository.level}-checkouts-sparse-v1: /builds/worker/checkouts
|
||||
|
||||
features:
|
||||
taskclusterProxy: true
|
||||
@ -86,15 +86,15 @@ tasks:
|
||||
# exist in tree so we must hard code the hash
|
||||
# XXX Changing this will break Chain of Trust without an associated puppet and
|
||||
# scriptworker patch!
|
||||
image: 'taskcluster/decision:0.1.10@sha256:c5451ee6c655b3d97d4baa3b0e29a5115f23e0991d4f7f36d2a8f793076d6854'
|
||||
image: 'taskcluster/decision:2.0.0@sha256:4039fd878e5700b326d4a636e28c595c053fbcb53909c1db84ad1f513cf644ef'
|
||||
|
||||
maxRunTime: 1800
|
||||
|
||||
# TODO use mozilla-unified for the base repository once the tc-vcs
|
||||
# tar.gz archives are created or tc-vcs isn't being used.
|
||||
command:
|
||||
- /home/worker/bin/run-task
|
||||
- '--vcs-checkout=/home/worker/checkouts/gecko'
|
||||
- /builds/worker/bin/run-task
|
||||
- '--vcs-checkout=/builds/worker/checkouts/gecko'
|
||||
- '--sparse-profile=build/sparse-profiles/taskgraph'
|
||||
- '--'
|
||||
- bash
|
||||
@ -105,8 +105,8 @@ tasks:
|
||||
# still uses tc-vcs, which does not support mozilla-unified
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1383973
|
||||
in: >
|
||||
cd /home/worker/checkouts/gecko &&
|
||||
ln -s /home/worker/artifacts artifacts &&
|
||||
cd /builds/worker/checkouts/gecko &&
|
||||
ln -s /builds/worker/artifacts artifacts &&
|
||||
./mach --log-no-times taskgraph decision
|
||||
--pushlog-id='${push.pushlog_id}'
|
||||
--pushdate='${push.pushdate}'
|
||||
@ -123,7 +123,7 @@ tasks:
|
||||
artifacts:
|
||||
'public':
|
||||
type: 'directory'
|
||||
path: '/home/worker/artifacts'
|
||||
path: '/builds/worker/artifacts'
|
||||
expires: {$fromNow: '1 year'}
|
||||
|
||||
extra:
|
||||
|
@ -2,8 +2,9 @@ FROM ubuntu:16.04
|
||||
MAINTAINER Greg Arndt <garndt@mozilla.com>
|
||||
|
||||
# Add worker user
|
||||
RUN useradd -d /home/worker -s /bin/bash -m worker
|
||||
RUN mkdir /home/worker/artifacts && chown worker:worker /home/worker/artifacts
|
||||
RUN mkdir /builds
|
||||
RUN useradd -d /builds/worker -s /bin/bash -m worker
|
||||
RUN mkdir /builds/worker/artifacts && chown worker:worker /builds/worker/artifacts
|
||||
|
||||
# %include python/mozbuild/mozbuild/action/tooltool.py
|
||||
ADD topsrcdir/python/mozbuild/mozbuild/action/tooltool.py /tmp/tooltool.py
|
||||
@ -18,11 +19,11 @@ ADD system-setup.sh /tmp/system-setup.sh
|
||||
RUN bash /tmp/system-setup.sh
|
||||
|
||||
# %include taskcluster/docker/recipes/run-task
|
||||
ADD topsrcdir/taskcluster/docker/recipes/run-task /home/worker/bin/run-task
|
||||
ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
|
||||
|
||||
ENV PATH /home/worker/bin:$PATH
|
||||
ENV PATH /builds/worker/bin:$PATH
|
||||
ENV SHELL /bin/bash
|
||||
ENV HOME /home/worker
|
||||
ENV HOME /builds/worker
|
||||
|
||||
# Set a default command useful for debugging
|
||||
CMD ["/bin/bash", "--login"]
|
||||
|
@ -1 +1 @@
|
||||
sha256:c5451ee6c655b3d97d4baa3b0e29a5115f23e0991d4f7f36d2a8f793076d6854
|
||||
sha256:4039fd878e5700b326d4a636e28c595c053fbcb53909c1db84ad1f513cf644ef
|
||||
|
@ -1 +1 @@
|
||||
0.1.10
|
||||
2.0.0
|
||||
|
@ -38,7 +38,7 @@ payload:
|
||||
|
||||
# Note: This task is built server side without the context or tooling that
|
||||
# exist in tree so we must hard code the version
|
||||
image: 'taskcluster/decision:0.1.7'
|
||||
image: 'taskcluster/decision:2.0.0@sha256:4039fd878e5700b326d4a636e28c595c053fbcb53909c1db84ad1f513cf644ef'
|
||||
|
||||
# Virtually no network or other potentially risky operations happen as part
|
||||
# of the task timeout aside from the initial clone. We intentionally have
|
||||
|
Loading…
Reference in New Issue
Block a user