Bug 1588392 - Switch to new GCP treescript workers, r=mtabara a=release
authorNick Thomas <nthomas@mozilla.com>
Wed, 16 Oct 2019 20:41:11 +0000
changeset 555681 3febfcc28926e9752f9d13d7e63844acbea94c0e
parent 555680 a2390ed1297d4a5472066400448ab3fc6cbfa340
child 555682 48b17276d88528ca536aa422d5eabc984002b2e2
push id2185
push usermtabara@mozilla.com
push dateMon, 04 Nov 2019 19:27:34 +0000
treeherdermozilla-release@e19149a8ab7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara, release
bugs1588392
milestone70.0.2
Bug 1588392 - Switch to new GCP treescript workers, r=mtabara a=release Differential Revision: https://phabricator.services.mozilla.com/D49360
taskcluster/ci/release-early-tagging/kind.yml
taskcluster/ci/release-version-bump/kind.yml
taskcluster/docs/versioncontrol.rst
taskcluster/taskgraph/util/workertypes.py
--- a/taskcluster/ci/release-early-tagging/kind.yml
+++ b/taskcluster/ci/release-early-tagging/kind.yml
@@ -10,31 +10,28 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 job-defaults:
     description: Release Promotion version tag for buildN
     run-on-projects: []
     shipping-phase: promote
     worker-type:
         by-project:
-            mozilla-(beta|release|esr.*): scriptworker-prov-v1/treescript-v1
-            maple: scriptworker-prov-v1/treescript-v1
-            birch: scriptworker-prov-v1/treescript-v1
-            jamun: scriptworker-prov-v1/treescript-v1
-            default: scriptworker-prov-v1/treescript-dev
+            mozilla-(beta|release|esr.*): scriptworker-k8s/gecko-3-tree
+            maple: scriptworker-k8s/gecko-3-tree
+            default: scriptworker-k8s/gecko-1-tree
     worker:
         implementation: treescript
         tags: ['buildN']
         bump: false
         dontbuild: true
         push:
             by-project:
                 mozilla-(beta|release|esr.*): true
                 maple: true
-                birch: true
                 default: false
 
 jobs:
     fennec:
         name: fennec-tag-buildN
         shipping-product: fennec
 
     firefox:
--- a/taskcluster/ci/release-version-bump/kind.yml
+++ b/taskcluster/ci/release-version-bump/kind.yml
@@ -13,43 +13,39 @@ kind-dependencies:
     - release-beetmover-push-to-release
 
 job-defaults:
     description: Release Promotion version bump/tag
     run-on-projects: []
     shipping-phase: ship
     worker-type:
         by-project:
-            mozilla-(beta|release|esr.*): scriptworker-prov-v1/treescript-v1
-            maple: scriptworker-prov-v1/treescript-v1
-            birch: scriptworker-prov-v1/treescript-v1
-            jamun: scriptworker-prov-v1/treescript-v1
-            default: scriptworker-prov-v1/treescript-dev
+            mozilla-(beta|release|esr.*): scriptworker-k8s/gecko-3-tree
+            maple: scriptworker-k8s/gecko-3-tree
+            default: scriptworker-k8s/gecko-1-tree
     worker:
         implementation: treescript
         dontbuild: true
         tags: ['release']
         bump: true
         bump-files:
             by-project:
                 default: ["browser/config/version_display.txt"]
                 mozilla-(release|esr.*):
                     - "browser/config/version.txt"
                     - "browser/config/version_display.txt"
                     - "config/milestone.txt"
-                jamun:
+                maple:
                     - "browser/config/version.txt"
                     - "browser/config/version_display.txt"
                     - "config/milestone.txt"
         push:
             by-project:
                 mozilla-(beta|release|esr.*): true
                 maple: true
-                birch: true
-                jamun: true
                 default: false
 
 jobs:
     fennec:
         name: fennec-version-bump
         shipping-product: fennec
 
     firefox:
--- a/taskcluster/docs/versioncontrol.rst
+++ b/taskcluster/docs/versioncontrol.rst
@@ -21,18 +21,19 @@ at the path ``hgext/robustcheckout/__ini
 When upgrading Mercurial, the ``robustcheckout`` extension should also
 be updated to ensure it is compatible with the version of Mercurial
 being upgraded to. Typically, one simply copies the latest version
 from ``version-control-tools`` into the vendored locations.
 
 The locations are as follows:
 
 - In-tree: ``testing/mozharness/external_tools/robustcheckout.py``
-- Treescript: ``https://github.com/mozilla-releng/treescript/tree/master/treescript/py2/robustcheckout.py``
+- Treescript: ``https://github.com/mozilla-releng/scriptworker-scripts/blob/master/treescript/treescript/py2/robustcheckout.py``
 - build-puppet: ``https://github.com/mozilla-releng/build-puppet/blob/master/modules/mercurial/files/robustcheckout.py``
+- ronin_puppet: ``https://github.com/mozilla-platform-ops/ronin_puppet/blob/master/modules/mercurial/files/robustcheckout.py``
 - OpenCloudConfig: ``https://github.com/mozilla-releng/OpenCloudConfig/blob/master/userdata/Configuration/FirefoxBuildResources/robustcheckout.py``
 
 
 Debian Packages for Debian Based Docker Images
 ----------------------------------------------
 
 ``taskcluster/ci/packages/kind.yml`` defines custom Debian packages for
 Mercurial. These are installed in various Docker images.
--- a/taskcluster/taskgraph/util/workertypes.py
+++ b/taskcluster/taskgraph/util/workertypes.py
@@ -19,17 +19,18 @@ WORKER_TYPES = {
     'invalid/always-optimized': ('always-optimized', None),
     'scriptworker-k8s/gecko-1-balrog': ('balrog', None),
     'scriptworker-k8s/gecko-3-balrog': ('balrog', None),
     'scriptworker-k8s/gecko-3-beetmover': ('beetmover', None),
     'scriptworker-prov-v1/pushapk-v1': ('push-apk', None),
     "scriptworker-prov-v1/signing-linux-v1": ('scriptworker-signing', None),
     "scriptworker-k8s/gecko-3-shipit": ('shipit', None),
     "scriptworker-k8s/gecko-1-shipit": ('shipit', None),
-    "scriptworker-prov-v1/treescript-v1": ('treescript', None),
+    "scriptworker-k8s/gecko-3-tree": ('treescript', None),
+    "scriptworker-k8s/gecko-1-tree": ('treescript', None),
     'terraform-packet/gecko-t-linux': ('docker-worker', 'linux'),
     'releng-hardware/gecko-t-osx-1014': ('generic-worker', 'macosx'),
 }
 
 
 @memoize
 def _get(graph_config, alias, level):
     """Get the configuration for this worker_type alias: {provisioner,