Bug 1356952 - Move tooltool manifests defined in toolchain build scripts to taskcluster job definitions. r=mshal

The toolchain build scripts are currently defining the tooltool
manifest they use on their own. We move the definitions to the
taskcluster job definitions to normalize on everything using that.

--HG--
extra : rebase_source : cbab2e32d78d711fcb595763d0c2600c7c0c423e

taskcluster/ci/toolchain/linux.yml

@@ -13,6 +13,8 @@ linux64-clang:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
     run:
         using: toolchain-script
         script: build-clang-linux.sh
@@ -35,6 +37,8 @@ linux64-clang-tidy:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/releng.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy-linux.sh
@@ -89,6 +93,8 @@ linux64-cctools-port:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest"
     run:
         using: toolchain-script
         script: build-cctools-port.sh
@@ -107,6 +113,8 @@ linux64-hfsplus:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/clang.manifest"
     run:
         using: toolchain-script
         script: build-hfsplus-linux.sh

taskcluster/ci/toolchain/macosx.yml

@@ -13,6 +13,8 @@ macosx64-clang:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-clang-macosx.sh
@@ -35,6 +37,8 @@ macosx64-clang-tidy:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy-macosx.sh
@@ -55,6 +59,8 @@ macosx64-cctools-port:
     worker:
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
     run:
         using: toolchain-script
         script: build-cctools-port-macosx.sh

taskcluster/ci/toolchain/windows.yml

@@ -12,6 +12,8 @@ win32-clang-cl:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang32-windows.sh
@@ -29,6 +31,8 @@ win64-clang-cl:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang64-windows.sh
@@ -49,6 +53,8 @@ win32-clang-tidy:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy32-windows.sh
@@ -69,6 +75,8 @@ win64-clang-tidy:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 36000
+        env:
+            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/build-clang-cl.manifest"
     run:
         using: toolchain-script
         script: build-clang-tidy64-windows.sh

taskcluster/scripts/misc/build-cctools-port-macosx.sh

@@ -30,7 +30,6 @@ echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
 
 # Fetch clang from tooltool
 cd $WORKSPACE/build/src
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # Configure crosstools-port

taskcluster/scripts/misc/build-cctools-port.sh

@@ -26,7 +26,6 @@ echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
 
 # Fetch clang from tooltool
 cd $WORKSPACE/build/src
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # Configure crosstools-port

taskcluster/scripts/misc/build-clang-linux.sh

@@ -9,7 +9,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/releng.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # gets a bit too verbose here

taskcluster/scripts/misc/build-clang-macosx.sh

@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm

taskcluster/scripts/misc/build-clang-tidy-linux.sh

@@ -9,7 +9,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/releng.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # gets a bit too verbose here

taskcluster/scripts/misc/build-clang-tidy-macosx.sh

@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/macosx64/cross-clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 # ld needs libLTO.so from llvm

taskcluster/scripts/misc/build-clang-windows-helper32.sh

@@ -13,8 +13,7 @@ if [ ! -e ${TOOLTOOL_AUTH_FILE} ]; then
     exit 1
 fi
 
-TOOLTOOL_MANIFEST=build/src/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
+./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "build/src/${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
-./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
 
 # Set up all the Visual Studio paths.
 MSVC_DIR=vs2015u3

taskcluster/scripts/misc/build-clang-windows-helper64.sh

@@ -13,8 +13,7 @@ if [ ! -e ${TOOLTOOL_AUTH_FILE} ]; then
     exit 1
 fi
 
-TOOLTOOL_MANIFEST=build/src/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
+./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "build/src/${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
-./build/src/mach artifact toolchain -v --authentication-file="${TOOLTOOL_AUTH_FILE}" --tooltool-manifest "${TOOLTOOL_MANIFEST}"${TOOLTOOL_CACHE:+ --cache-dir ${TOOLTOOL_CACHE}}
 
 # Set up all the Visual Studio paths.
 MSVC_DIR=vs2015u3

taskcluster/scripts/misc/build-hfsplus-linux.sh

@@ -8,7 +8,6 @@ UPLOAD_DIR=$WORKSPACE/artifacts
 
 cd $HOME_DIR/src
 
-TOOLTOOL_MANIFEST=browser/config/tooltool-manifests/linux64/clang.manifest
 . taskcluster/scripts/misc/tooltool-download.sh
 
 export PATH=$PATH:$HOME_DIR/src/clang/bin