Bug 1456182 - Fix python environment creation of update-verify-config-creator, r=nthomas a=release CLOSED TREE DEVEDITION_61_0b1_BUILD1 DEVEDITION_61_0b1_RELEASE
authorTom Prince <mozilla@hocat.ca>
Sat, 28 Apr 2018 23:02:12 +1200
changeset 789658 b5ac348daeec346d4bfb38aa01fadb7354fd156a
parent 789657 89f3ba72015ad49046247a3017087630c244eeae
child 789659 375a08fc2d812b85d8e8f2c67e380bbb98706b6c
child 789660 d09e663332575d8bbe1570ee3dbc4fc765d73071
child 791316 1b1a8ab75f1fa8b6bc7ebba65909dc87aa53ad7b
push id108293
push usernthomas@mozilla.com
push dateMon, 30 Apr 2018 01:46:46 +0000
reviewersnthomas, release
bugs1456182
milestone61.0
Bug 1456182 - Fix python environment creation of update-verify-config-creator, r=nthomas a=release CLOSED TREE
build/sparse-profiles/update-verify
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-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)