Revert "please_cli: store nix and commit hash to index service on eac…

…h deploy (#1877)" (#1954) This reverts commit 28d29a6.
mozilla · Mar 13, 2019 · a273dcb · a273dcb
1 parent b83c801
commit a273dcb
Show file tree

Hide file tree

Showing 13 changed files with 231 additions and 366 deletions.
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -99,7 +99,6 @@ tasks:
       - queue:create-task:highest:aws-provisioner-v1/releng-*
       - queue:scheduler-id:taskcluster-github
       - queue:route:index.project.releng.services.requests.{{ event.base.repo.branch }}.*
-      - queue:route:index.project.releng.services.deployment.{{ event.base.repo.branch }}.*
       - secrets:get:repo:github.com/mozilla-releng/services:branch:testing
       - docker-worker:capability:privileged
       - notify:irc-channel:#release-services
@@ -141,7 +140,6 @@ tasks:
       - queue:create-task:highest:aws-provisioner-v1/releng-*
       - queue:scheduler-id:taskcluster-github
       - queue:route:index.project.releng.services.requests.{{ event.base.repo.branch }}.*
-      - queue:route:index.project.releng.services.deployment.{{ event.base.repo.branch }}.*
       - secrets:get:repo:github.com/mozilla-releng/services:branch:staging
       - docker-worker:capability:privileged
       - notify:irc-channel:#release-services
@@ -183,7 +181,6 @@ tasks:
       - queue:create-task:highest:aws-provisioner-v1/releng-*
       - queue:scheduler-id:taskcluster-github
       - queue:route:index.project.releng.services.requests.{{ event.base.repo.branch }}.*
-      - queue:route:index.project.releng.services.deployment.{{ event.base.repo.branch }}.*
       - secrets:get:repo:github.com/mozilla-releng/services:branch:production
       - docker-worker:capability:privileged
       - notify:irc-channel:#release-services

diff --git a/lib/cli_common/requirements-extra.json b/lib/cli_common/requirements-extra.json
@@ -34,8 +34,8 @@
         "structlog"
     ],
     "taskcluster": [
-        "Click",
         "Logbook",
+        "Click",
         "mozdef-client",
         "raven",
         "structlog",

diff --git a/lib/please_cli/default.nix b/lib/please_cli/default.nix
@@ -17,7 +17,7 @@ let
     version = fileContents ./please_cli/VERSION;
     src = filterSource ./. { inherit (self) name; };
     src_path = "lib/${project_name}";
-    doCheck = false;
+    doCheck = true;
     buildInputs =
       [ makeWrapper ] ++
       (fromRequirementsFile ./../cli_common/requirements-dev.txt python.packages) ++

diff --git a/lib/please_cli/please_cli/config.py b/lib/please_cli/please_cli/config.py
@@ -51,22 +51,20 @@
 POSTGRESQL_BIN_DIR = os.environ.get('POSTGRESQL_BIN_DIR', '')  # must end with /
 
 IN_DOCKER = False
-if os.path.isdir('/proc/1'):
-    with open('/proc/1/cgroup', 'rt') as ifh:
-        IN_DOCKER = 'docker' in ifh.read()
+with open('/proc/1/cgroup', 'rt') as ifh:
+    IN_DOCKER = 'docker' in ifh.read()
 
 TEMPLATES = {
     'backend-json-api': {}
 }
 
 DEV_PROJECTS = ['postgresql', 'redis']
-OUTSIDE_PROJECTS = ['scriptworker/shipitscript']
+PROJECTS = list(map(lambda x: x.replace('_', '-')[len(SRC_DIR) + 1:],
+                    filter(lambda x: os.path.exists(os.path.join(SRC_DIR, x, 'default.nix')),
+                           glob.glob(SRC_DIR + '/*') + glob.glob(SRC_DIR + '/*/*'))))
+PROJECTS += ['scriptworker/shipitscript']
+PROJECTS += DEV_PROJECTS
 
-PROJECTS = OUTSIDE_PROJECTS + DEV_PROJECTS
-PROJECTS += list(map(lambda x: x.replace('_', '-')[len(SRC_DIR) + 1:],
-                     filter(lambda x: os.path.exists(os.path.join(SRC_DIR, x, 'default.nix')),
-                            glob.glob(SRC_DIR + '/*') + glob.glob(SRC_DIR + '/*/*'))))
-PROJECTS = sorted(PROJECTS)
 
 # TODO: below data should be placed in src/<app>/default.nix files alongside
 PROJECTS_CONFIG = {