merges default -> production production
authorJordan Lund <jlund@mozilla.com>
Wed, 27 Jun 2018 10:00:06 -0700
branchproduction
changeset 4478 221f8f97bd5e405cc790baf6a4d14655f315c7ef
parent 4476 193ed39b88f85b4de68898d1949d047a16c5dba4 (current diff)
parent 4477 37921510e646e421e265c0ed430e9ba1f6b0d71f (diff)
child 4481 244bb75b76363cc45e5efff5c19b2732d1eafab5
push id3582
push userjlund@mozilla.com
push dateWed, 27 Jun 2018 17:49:45 +0000
merges default -> production
--- a/configs/developer_config.py
+++ b/configs/developer_config.py
@@ -42,10 +42,10 @@ config = {
     "tooltool_cache": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
     "tooltool_cache_path": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
 
     # VCS tools
     "hgtool.py": 'https://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/hgtool.py',
     "gittool.py": 'https://hg.mozilla.org/build/puppet/raw-file/faaf5abd792e/modules/packages/files/gittool.py',
 
     # Android related
-    "host_utils_url": "https://api.pub.build.mozilla.org/tooltool/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
+    "host_utils_url": "https://tooltool.mozilla-releng.net/sha512/372c89f9dccaf5ee3b9d35fd1cfeb089e1e5db3ff1c04e35aa3adc8800bc61a2ae10e321f37ae7bab20b56e60941f91bb003bcb22035902a73d70872e7bd3282",
 }
--- a/configs/vcs_sync/beagle.py
+++ b/configs/vcs_sync/beagle.py
@@ -60,17 +60,17 @@ config = {
         "vcs": "hg",
         "branch_config": {
             "branches": {
                 "default": "aurora",
             },
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-beta",
         "revision": "default",
         "repo_name": "mozilla-beta",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -90,17 +90,17 @@ config = {
             ],
         },
         "tag_config": {
             "tag_regexes": [
                 "^RELEASE_BASE_",
             ],
         },
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-release",
         "revision": "default",
         "repo_name": "mozilla-release",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -120,17 +120,17 @@ config = {
             ],
         },
         "tag_config": {
             "tag_regexes": [
                 "^RELEASE_BASE_",
             ],
         },
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-esr45",
         "revision": "default",
         "repo_name": "mozilla-esr45",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -145,17 +145,17 @@ config = {
                 "default": "esr45",
             },
             "branch_regexes": [
                 "^GECKO[0-9]+esr_[0-9]+_RELBRANCH$",
             ],
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-esr52",
         "revision": "default",
         "repo_name": "mozilla-esr52",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -170,17 +170,17 @@ config = {
                 "default": "esr52",
             },
             "branch_regexes": [
                 "^GECKO[0-9]+esr_[0-9]+_RELBRANCH$",
             ],
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/releases/mozilla-esr60",
         "revision": "default",
         "repo_name": "mozilla-esr60",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -195,17 +195,17 @@ config = {
                 "default": "esr60",
             },
             "branch_regexes": [
                 "^GECKO[0-9]+esr_[0-9]+_RELBRANCH$",
             ],
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/integration/mozilla-inbound",
         "revision": "default",
         "repo_name": "mozilla-inbound",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -217,17 +217,17 @@ config = {
         "vcs": "hg",
         "branch_config": {
             "branches": {
                 "default": "inbound",
             },
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }, {
         "repo": "https://hg.mozilla.org/integration/fx-team",
         "revision": "default",
         "repo_name": "fx-team",
         "targets": [{
             "target_dest": "beagle/.git",
@@ -239,17 +239,17 @@ config = {
         "vcs": "hg",
         "branch_config": {
             "branches": {
                 "default": "fx-team",
             },
         },
         "tag_config": {},
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "gecko-dev"
         },
     }],
     "remote_targets": {
         "github-beagle": {
             "repo": "git@github.com:mozilla/gecko-dev.git",
             "ssh_key": "~/.ssh/releng-github-id_rsa",
             "vcs": "git",
--- a/configs/vcs_sync/build-repos.py
+++ b/configs/vcs_sync/build-repos.py
@@ -21,17 +21,17 @@ for repo in build_repos:
         "repo_name": "build-%s" % repo,
         "conversion_dir": "build-%s" % repo,
         "targets": [{
             "target_dest": "build-%s-github" % repo,
             "force_push": True
         }],
         "vcs": "hg",
         "mapper": {
-            "url": "https://api.pub.build.mozilla.org/mapper",
+            "url": "https://mapper.mozilla-releng.net",
             "project": "build-%s" % repo,
         },
         "branch_config": {
             "branches": {
                 "default": "master",
             },
             "branch_regexes": [
                 "^.*$"
@@ -59,17 +59,17 @@ conversion_repos.append({
     "repo_name": "version-control-tools",
     "conversion_dir": "version-control-tools",
     "targets": [{
         "target_dest": "version-control-tools-github",
         "force_push": True,
     }],
     "vcs": "hg",
     "mapper": {
-        "url": "https://api.pub.build.mozilla.org/mapper",
+        "url": "https://mapper.mozilla-releng.net",
         "project": "version-control-tools",
     },
     "branch_config": {
         "branches": {
             "default": "master",
         },
     },
 })
@@ -94,17 +94,17 @@ conversion_repos.append({
         "tag_config": {
             "tag_regexes": [
                 "^.*$"
             ]
         },
     }],
     "vcs": "hg",
     "mapper": {
-        "url": "https://api.pub.build.mozilla.org/mapper",
+        "url": "https://mapper.mozilla-releng.net",
         "project": "nss",
     },
     "branch_config": {
         "branches": {
             "default": "master",
         },
         "branch_regexes": [
             "^.*$",
@@ -130,17 +130,17 @@ conversion_repos.append({
         "tag_config": {
             "tag_regexes": [
                 "^.*$"
             ]
         },
     }],
     "vcs": "hg",
     "mapper": {
-        "url": "https://api.pub.build.mozilla.org/mapper",
+        "url": "https://mapper.mozilla-releng.net",
         "project": "conduit",
     },
     "branch_config": {
         "branches": {
             "default": "master",
         },
         "branch_regexes": [
             "^.*$",
@@ -160,17 +160,17 @@ conversion_repos.append({
     "repo_name": "comm-central",
     "conversion_dir": "comm-central",
     "targets": [{
         "target_dest": "comm-central-github",
         "force_push": True,
     }],
     "vcs": "hg",
     "mapper": {
-        "url": "https://api.pub.build.mozilla.org/mapper",
+        "url": "https://mapper.mozilla-releng.net",
         "project": "comm-central",
     },
     "branch_config": {
         "branches": {
             "default": "master",
         },
     },
 })
--- a/mozharness/mozilla/tooltool.py
+++ b/mozharness/mozilla/tooltool.py
@@ -12,17 +12,17 @@ TooltoolErrorList = PythonErrorList + [{
     'substr': 'ERROR - ', 'level': ERROR
 }]
 
 
 TOOLTOOL_PY_URL = \
     "https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py"
 
 TOOLTOOL_SERVERS = [
-    'https://api.pub.build.mozilla.org/tooltool/',
+    'https://tooltool.mozilla-releng.net',
 ]
 
 
 class TooltoolMixin(object):
     """Mixin class for handling tooltool manifests.
     To use a tooltool server other than the Mozilla server, override
     config['tooltool_servers'].  To specify a different authentication
     file than that used in releng automation,override