Merge pull request #29071 from lightsofapollo/backport-tc

Backport tc

build/docker/gaia-taskenv/Dockerfile

@@ -25,6 +25,7 @@ workdir /home/tester
 
 run git config --global user.email "gaia@mozilla.com"
 run git config --global user.name "gaia-taskenv"
+run npm install taskcluster-vcs@2.3.4 -g
 
 # run some more root commands which change frequently
 copy ./bin/entrypoint /home/tester/bin/entrypoint

build/docker/gaia-taskenv/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

build/docker/gaia-taskenv/bin/entrypoint

@@ -5,45 +5,13 @@ source ./bin/buildbot_step
 export DISPLAY=:99
 Xvfb :99 > /dev/null 2>&1 &
 
-checkout_cache='https://s3-us-west-2.amazonaws.com/test-caching/gaia.tar.gz'
 checkout_path="$PWD/git_checkout"
-cache_path="$PWD/caches/"
-
-# buildbot step is sourced directly so we can directly invoke functions from
-# this file in the buildbot steps...
-
-# Ensure cache folder exists (for local testing).
-mkdir -p $cache_path
-
-buildbot_step 'list caches' ls $cache_path
-
-# Helper utility to ensure we have a particular cached file.
-ensure_cached() {
-  local url=$1
-  local target="$cache_path/$2"
-
-  if [ ! -f $target ];
-  then
-    curl --retry 5  $url > $target
-  fi
-  echo $target
-}
 
 # Handle initial clone and caching of the initial clone...
 step_clone() {
-  # If we already have a checkout do not clobber it...
-  if [ -d "$checkout_path" ];
-  then
-    # TODO: Consider clobbering any state here but this could be very dangerous
-    # to run locally then...
-    return 0
-  fi
-
   # Extract the cached clone (this is kept as a tarball to always keep a clean
   # working state without worrying about tree issues).
-  clone_tar=$(ensure_cached "$checkout_cache" "clone_cache.tar.gz")
-  mkdir -p $checkout_path
-  tar -x -z -f $clone_tar --strip-components=1 -C $checkout_path
+  tc-vcs checkout $checkout_path $GITHUB_BASE_GIT
 }
 
 # Run the checkout to the correct url, etc...

taskgraph.json

@@ -10,16 +10,16 @@
       "reruns": 3,
       "task": {
         "metadata": {
-          "name": "Task graph construction...."
+          "name": "Gaia Taskcluster Decision Task"
         },
         "provisionerId": "aws-provisioner",
-        "workerType": "gaia",
+        "workerType": "gaia-decision",
         "scopes": ["docker-worker:cache:gaia-misc-caches"],
         "payload": {
           "cache": {
             "gaia-misc-caches": "/home/tester/caches/"
           },
-          "image": "taskcluster/gaia-taskenv:0.7.2",
+          "image": "taskcluster/gaia-taskenv:0.8.0",
           "command": [
             "entrypoint",
             "echo 'what' && make node_modules && node tests/taskcluster/bin/graph > /graph.json && cat /graph.json"
@@ -28,7 +28,8 @@
         },
         "extra": {
           "treeherder": {
-            "symbol": "G"
+            "symbol": "D",
+            "groupSymbol": "?"
           }
         }
       }

tests/ci/gaia_ui_tests/script

@@ -1,6 +1,7 @@
 #! /bin/bash -vex
 mkdir -p artifacts/logs/gaia_ui_tests_gecko/
 ./bin/gaia-ui-tests \
+    --type=b2g-external \
     --gecko-log artifacts/gaia_ui_tests_gecko/ \
     --html-output artifacts/gaia_ui_tests_report.html \
     --this-chunk=${THIS_CHUNK:=1} \

tests/taskcluster/tasks.yml

@@ -16,7 +16,7 @@ params:
 definitions:
   build_unit:
   build_integration:
-    chunks: 4
+    chunks: 10
 
   gaia_ui_tests:
     chunks: 30