docker: rename hgrpm builder to hgrpm-centos6 (bug 1261212); r=fubar
authorGregory Szorc <gps@mozilla.com>
Fri, 01 Apr 2016 13:00:29 -0700
changeset 7668 716b60a2e0691e335e9ee626102a9e1fba1006e3
parent 7667 7e9a579ee528e15b6c4fcf717d9ba8be570ce9ef
child 7669 94f53821e6678083f638d11d1697c102ae884c53
push id728
push usergszorc@mozilla.com
push dateFri, 01 Apr 2016 21:28:06 +0000
reviewersfubar
bugs1261212
docker: rename hgrpm builder to hgrpm-centos6 (bug 1261212); r=fubar Because we're about to add a container to build RPMs in CentOS 7. MozReview-Commit-ID: 2VhnbhheCMz
testing/docker/builder-hgrpm-centos6/Dockerfile
testing/docker/builder-hgrpm-centos6/entrypoint.sh
testing/docker/builder-hgrpm-centos6/rpmserver.py
testing/docker/builder-hgrpm/Dockerfile
testing/docker/builder-hgrpm/entrypoint.sh
testing/docker/builder-hgrpm/rpmserver.py
testing/vcttesting/docker.py
rename from testing/docker/builder-hgrpm/Dockerfile
rename to testing/docker/builder-hgrpm-centos6/Dockerfile
rename from testing/docker/builder-hgrpm/entrypoint.sh
rename to testing/docker/builder-hgrpm-centos6/entrypoint.sh
rename from testing/docker/builder-hgrpm/rpmserver.py
rename to testing/docker/builder-hgrpm-centos6/rpmserver.py
--- a/testing/vcttesting/docker.py
+++ b/testing/vcttesting/docker.py
@@ -1301,17 +1301,17 @@ class Docker(object):
             for filename, data in res.json().items():
                 files[filename] = base64.b64decode(data)
 
         self.client.remove_container(container, v=True)
 
         return files
 
     def build_mercurial_rpms(self):
-        return self._get_files_from_http_container('hgrpm',
+        return self._get_files_from_http_container('hgrpm-centos6',
             'Generating RPMs...')
 
     def get_full_image(self, image):
         for i in self.client.images():
             iid = i['Id']
             if iid.startswith('sha256:'):
                 iid = iid[7:]