hgmaster: remove legacy path normalization
authorGregory Szorc <gps@mozilla.com>
Thu, 05 Mar 2015 23:41:37 -0800
changeset 360499 6effcc0047e7b7a9e1df61210db4b3f4d16cd315
parent 360498 30fe2d69feab359ba1e2585477d3a19cf688f359
child 360500 d2350e6e7e399fce507b1499e07218c4695fbc22
push id16998
push userrwood@mozilla.com
push dateMon, 02 May 2016 19:42:03 +0000
hgmaster: remove legacy path normalization The line being modified was removed a while ago.
testing/docker/builder-hgmaster/Dockerfile
--- a/testing/docker/builder-hgmaster/Dockerfile
+++ b/testing/docker/builder-hgmaster/Dockerfile
@@ -62,21 +62,18 @@ ADD extra/vct/scripts/repo-push.sh /usr/
 # TODO: Fix this logging or remove record-pushes script as it's information duplicates serverlog
 RUN touch /var/log/hg-push.log; chmod 666 /var/log/hg-push.log
 
 # Put the files in the right place
 ADD extra/vct/scripts/pash/* /usr/local/bin/
 
 # TODO: Set up an LDAP container, run tests against it
 # Comment out the ldap nastiness
-RUN sed -i 's/, ldap_helper//; s/ .*ldap_helper.*/           pass/' /usr/local/bin/pash.py
-RUN sed -i 's/^from ldap_helper.*//; s/    account_status =.*/    return 1/' /usr/local/bin/hg_helper.py
-
-# Fix path in pash.py
-RUN sed -i "s/'\/repo_local\/mozilla/'\/repo_local\/mozilla\/mozilla/" /usr/local/bin/hg_helper.py
+#RUN sed -i 's/, ldap_helper//; s/ .*ldap_helper.*/           pass/' /usr/local/bin/pash.py
+#RUN sed -i 's/^from ldap_helper.*//; s/    account_status =.*/    return 1/' /usr/local/bin/hg_helper.py
 
 # Configure sshd to use pash.py
 RUN sed -i 's/#\tForceCommand.*/ForceCommand \/usr\/local\/bin\/pash.py/' /etc/ssh/sshd_config
 RUN sed -i 's/#PermitRootLogin/PermitRootLogin/' /etc/ssh/sshd_config
 
 # Generate the SSH host keys
 RUN service sshd start