Bug 1427068 - Enable the mercurial share extension at the system level. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 26 Dec 2017 17:01:55 +0900
changeset 714572 f0b2d72a0e3cd6096405a67da9d36324708498b0
parent 714571 f9aacb4510c2b09d436b57ac016debb08f92678c
child 714573 56bf0783bdf3157648cd5b83f295e198409701fc
push id93954
push userbmo:mh+mozilla@glandium.org
push dateTue, 26 Dec 2017 08:11:48 +0000
reviewersgps
bugs1427068, 1399679
milestone59.0a1
Bug 1427068 - Enable the mercurial share extension at the system level. r?gps I suppose it was setup through ~worker/.hgrc before we started installing a /etc/mercurial/hgrc that enables a few other extensions and sets some preferences. There is no reason to now have two places where mercurial is being set up, and it feels natural that we set it up at the system level. Ideally, we'd also clean up the centos6-based images, but they require an update of the centos6-build and centos6-build-upd images on the docker hub, which is not really convenient, and those images are going to be obsoleted soon anyways (bug 1399679).
taskcluster/docker/android-build/Dockerfile
taskcluster/docker/recipes/install-mercurial.sh
--- a/taskcluster/docker/android-build/Dockerfile
+++ b/taskcluster/docker/android-build/Dockerfile
@@ -11,21 +11,16 @@ RUN mkdir -p /builds && \
 
 # Declare default working folder
 WORKDIR /builds/worker
 
 VOLUME /builds/worker/checkouts
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 
-# Add common hg configuration.
-# %include taskcluster/docker/centos6-build/hgrc
-COPY topsrcdir/taskcluster/docker/centos6-build/hgrc /builds/worker/.hgrc
-RUN chown worker:worker /builds/worker/.hgrc
-
 # Set variables normally configured at login, by the shell' parent process,
 # these are taken from GNU su manual.  Also set DEBIAN_FRONTEND to advise
 # apt-get of our situation.
 ENV HOME=/builds/worker \
     SHELL=/bin/bash \
     USER=worker \
     LOGNAME=worker \
     HOSTNAME=taskcluster-worker \
--- a/taskcluster/docker/recipes/install-mercurial.sh
+++ b/taskcluster/docker/recipes/install-mercurial.sh
@@ -126,16 +126,17 @@ cat >/etc/mercurial/hgrc <<EOF
 delay = 1.0
 refresh = 1.0
 assume-tty = true
 
 [web]
 cacerts = ${CERT_PATH}
 
 [extensions]
+share =
 sparse =
 robustcheckout = /usr/local/mercurial/robustcheckout.py
 
 [hostsecurity]
 # When running a modern Python, Mercurial will default to TLS 1.1+.
 # When running on a legacy Python, Mercurial will default to TLS 1.0+.
 # There is no good reason we shouldn't be running a modern Python
 # capable of speaking TLS 1.2. And the only Mercurial servers we care