Bug 1456182: [update-verify] Stop creating a virtualenv in update-verify-config-creator; r=nthomas
authorTom Prince <mozilla@hocat.ca>
Sun, 22 Apr 2018 18:51:38 -0600
changeset 472505 32f1ddc878092d0f15517e1ed5e17ce19293a3ff
parent 472504 2c8741c94a0dd857b86f48aad3e8f82cb8c5e6d7
child 472506 9bf70e179625ca212595e8fe8cd51b237fe99039
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnthomas
bugs1456182
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1456182: [update-verify] Stop creating a virtualenv in update-verify-config-creator; r=nthomas Since it is run with `mach python`, it uses the environment defined by `build/virtualenv_packages.txt`. Thus, we don't need to create a separate virtualenv. Differential Revision: https://phabricator.services.mozilla.com/D1015
build/sparse-profiles/update-verify
taskcluster/ci/release-secondary-update-verify-config/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
testing/mozharness/scripts/release/update-verify-config-creator.py
deleted file mode 100644
--- a/build/sparse-profiles/update-verify
+++ /dev/null
@@ -1,4 +0,0 @@
-%include build/sparse-profiles/mozharness
-
-[include]
-path:build/mozrelease
--- a/taskcluster/ci/release-secondary-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-secondary-update-verify-config/kind.yml
@@ -21,17 +21,17 @@ job-defaults:
          in-tree: "update-verify"
       max-run-time: 3600
       artifacts:
          - name: public/build/update-verify.cfg
            path: /builds/worker/checkouts/gecko/update-verify.cfg
            type: file
    run:
       using: run-task
-      sparse-profile: update-verify
+      sparse-profile: mozharness
    extra:
       app-name: browser
       product: firefox
       archive-prefix:
          by-project:
             birch: "http://ftp.stage.mozaws.net/pub"
             default: "https://archive.mozilla.org/pub"
       previous-archive-prefix:
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -20,17 +20,17 @@ job-defaults:
          in-tree: "update-verify"
       max-run-time: 3600
       artifacts:
          - name: public/build/update-verify.cfg
            path: /builds/worker/checkouts/gecko/update-verify.cfg
            type: file
    run:
       using: run-task
-      sparse-profile: update-verify
+      sparse-profile: mozharness
    extra:
       app-name: browser
       archive-prefix:
          by-project:
             birch: "http://ftp.stage.mozaws.net/pub"
             jamun: "http://ftp.stage.mozaws.net/pub"
             maple: "http://ftp.stage.mozaws.net/pub"
             default: "https://archive.mozilla.org/pub"
--- a/testing/mozharness/scripts/release/update-verify-config-creator.py
+++ b/testing/mozharness/scripts/release/update-verify-config-creator.py
@@ -7,17 +7,16 @@ import re
 import sys
 from urlparse import urljoin
 
 
 sys.path.insert(1, os.path.dirname(os.path.dirname(sys.path[0])))
 
 from mozharness.base.log import DEBUG, INFO, FATAL
 from mozharness.base.script import BaseScript
-from mozharness.base.python import VirtualenvMixin
 
 
 def is_triangualar(x):
     """Check if a number is triangular (0, 1, 3, 6, 10, 15, ...)
     see: https://en.wikipedia.org/wiki/Triangular_number#Triangular_roots_and_tests_for_triangular_numbers # noqa
 
     >>> is_triangualar(0)
     True
@@ -33,17 +32,17 @@ def is_triangualar(x):
     True
     >>> all(not is_triangualar(x) for x in [4, 5, 8, 9, 11, 17, 25, 29, 39, 44, 59, 61, 72, 98, 112])
     True
     """
     n = (math.sqrt(8*x + 1) - 1)/2
     return n == int(n)
 
 
-class UpdateVerifyConfigCreator(BaseScript, VirtualenvMixin):
+class UpdateVerifyConfigCreator(BaseScript):
     config_options = [
         [["--product"], {
             "dest": "product",
             "help": "Product being tested, as used in the update URL and filenames. Eg: firefox",
         }],
         [["--stage-product"], {
             "dest": "stage_product",
             "help": "Product being tested, as used in stage directories and ship it"
@@ -160,32 +159,23 @@ class UpdateVerifyConfigCreator(BaseScri
             "help": "A list of locales to generate full update verify checks for",
         }],
     ]
 
     def __init__(self):
         BaseScript.__init__(
             self,
             config_options=self.config_options,
-            config={
-                "virtualenv_modules": [
-                    "mozrelease",
-                ],
-                "virtualenv_path": "venv",
-            },
+            config={},
             all_actions=[
-                "create-virtualenv",
-                "activate-virtualenv",
                 "gather-info",
                 "create-config",
                 "write-config",
             ],
             default_actions=[
-                "create-virtualenv",
-                "activate-virtualenv",
                 "gather-info",
                 "create-config",
                 "write-config",
             ],
         )
 
     def _pre_config_lock(self, rw_config):
         super(UpdateVerifyConfigCreator, self)._pre_config_lock(rw_config)