From 3e6593d32578ce150571bce46bf596780085bdb8 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 27 Aug 2020 11:34:27 +0200 Subject: [PATCH] Switch to new macOS VM setup --- taskcluster/.build.yml | 3 --- taskcluster/.shared.yml | 7 +++++++ taskcluster/darwin-opt-base.tyml | 2 +- taskcluster/generic_tc_caching-darwin-opt-base.tyml | 2 +- taskcluster/homebrew_builds-darwin-amd64.yml | 1 + taskcluster/homebrew_tests-darwin-amd64.yml | 1 + taskcluster/pyenv-darwin-amd64.yml | 1 + taskcluster/swig-darwin-amd64.yml | 1 + taskcluster/test-darwin-opt-base.tyml | 2 +- taskcluster/tf_darwin-amd64-opt.yml | 3 +-- taskcluster/tf_ios-arm64-opt.yml | 3 +-- taskcluster/tf_ios-x86_64-opt.yml | 3 +-- 12 files changed, 17 insertions(+), 12 deletions(-) diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 40e07d1a..dfbb8c10 100644 --- a/taskcluster/.build.yml +++ b/taskcluster/.build.yml @@ -10,9 +10,6 @@ build: routes: [] maxRunTime: 3600 docker_image: "ubuntu:16.04" - generic: - workerType: 'ds-macos-light' - workerType: '' system_setup: > true diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index fb5d8726..ba584968 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -192,3 +192,10 @@ docker: dsTestsBeta: 'ci-ds-tests-b' dsHighMemTests: 'ci-ds-mem-tests' dsHighMemTestsBeta: 'ci-ds-mem-tests-b' +macOS: + tfBuild: 'ds-macos-tf-build' + tfBuildBeta: 'ds-macos-tf-build-b' + dsBuild: 'ds-macos-ds-build' + dsBuildBeta: 'ds-macos-ds-build-b' + dsTests: 'ds-macos-ds-tests' + dsTestsBeta: 'ds-macos-ds-tests-b' diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index 0eee5377..bb35cec0 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -1,6 +1,6 @@ taskId: ${taskcluster.taskId} provisionerId: ${taskcluster.generic.provisionerId} -workerType: ${taskcluster.generic.workerType} +workerType: ${macOS.dsBuild} taskGroupId: ${taskcluster.taskGroupId} schedulerId: ${taskcluster.schedulerId} dependencies: diff --git a/taskcluster/generic_tc_caching-darwin-opt-base.tyml b/taskcluster/generic_tc_caching-darwin-opt-base.tyml index 53f412f4..5d40ee9f 100644 --- a/taskcluster/generic_tc_caching-darwin-opt-base.tyml +++ b/taskcluster/generic_tc_caching-darwin-opt-base.tyml @@ -1,6 +1,6 @@ taskId: ${taskcluster.taskId} provisionerId: ${taskcluster.generic.provisionerId} -workerType: ${build.generic.workerType} +workerType: ${build.workerType} taskGroupId: ${taskcluster.taskGroupId} schedulerId: ${taskcluster.schedulerId} dependencies: diff --git a/taskcluster/homebrew_builds-darwin-amd64.yml b/taskcluster/homebrew_builds-darwin-amd64.yml index f5d60902..c9447cc7 100644 --- a/taskcluster/homebrew_builds-darwin-amd64.yml +++ b/taskcluster/homebrew_builds-darwin-amd64.yml @@ -3,6 +3,7 @@ build: cache: artifact_url: ${system.homebrew_builds.url} artifact_namespace: ${system.homebrew_builds.namespace} + workerType: ${macOS.dsBuild} scripts: setup: "taskcluster/tc-true.sh" build: "taskcluster/homebrew-build.sh --builds" diff --git a/taskcluster/homebrew_tests-darwin-amd64.yml b/taskcluster/homebrew_tests-darwin-amd64.yml index 4d1e7765..6b83e83c 100644 --- a/taskcluster/homebrew_tests-darwin-amd64.yml +++ b/taskcluster/homebrew_tests-darwin-amd64.yml @@ -3,6 +3,7 @@ build: cache: artifact_url: ${system.homebrew_tests.url} artifact_namespace: ${system.homebrew_tests.namespace} + workerType: ${macOS.dsBuild} scripts: setup: "taskcluster/tc-true.sh" build: "taskcluster/homebrew-build.sh --tests" diff --git a/taskcluster/pyenv-darwin-amd64.yml b/taskcluster/pyenv-darwin-amd64.yml index c3dfd55a..054aaa50 100644 --- a/taskcluster/pyenv-darwin-amd64.yml +++ b/taskcluster/pyenv-darwin-amd64.yml @@ -3,6 +3,7 @@ build: cache: artifact_url: ${system.pyenv.osx.url} artifact_namespace: ${system.pyenv.osx.namespace} + workerType: ${macOS.dsBuild} scripts: setup: "taskcluster/tc-true.sh" build: "taskcluster/pyenv-build.sh" diff --git a/taskcluster/swig-darwin-amd64.yml b/taskcluster/swig-darwin-amd64.yml index ecf5954e..f74ac4e5 100644 --- a/taskcluster/swig-darwin-amd64.yml +++ b/taskcluster/swig-darwin-amd64.yml @@ -7,6 +7,7 @@ build: cache: artifact_url: "${system.swig_build.osx.url}" artifact_namespace: "${system.swig_build.osx.namespace}" + workerType: ${macOS.dsBuild} scripts: setup: "taskcluster/tc-true.sh" build: "taskcluster/build.sh" diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml index 0ec4702a..1df6b95f 100644 --- a/taskcluster/test-darwin-opt-base.tyml +++ b/taskcluster/test-darwin-opt-base.tyml @@ -2,7 +2,7 @@ $if: '(event.event != "push") && (event.event != "tag")' then: taskId: ${taskcluster.taskId} provisionerId: ${taskcluster.generic.provisionerId} - workerType: ${taskcluster.generic.workerType} + workerType: ${macOS.dsTests} taskGroupId: ${taskcluster.taskGroupId} schedulerId: ${taskcluster.schedulerId} dependencies: diff --git a/taskcluster/tf_darwin-amd64-opt.yml b/taskcluster/tf_darwin-amd64-opt.yml index 64674b1f..4ab0646b 100644 --- a/taskcluster/tf_darwin-amd64-opt.yml +++ b/taskcluster/tf_darwin-amd64-opt.yml @@ -3,8 +3,7 @@ build: cache: artifact_url: ${system.tensorflow.darwin_amd64.url} artifact_namespace: ${system.tensorflow.darwin_amd64.namespace} - generic: - workerType: "ds-macos-heavy" + workerType: ${macOS.tfBuild} scripts: setup: "taskcluster/tf_tc-setup.sh" build: "taskcluster/tf_tc-build.sh --cpu" diff --git a/taskcluster/tf_ios-arm64-opt.yml b/taskcluster/tf_ios-arm64-opt.yml index edb3eb2b..1269209f 100644 --- a/taskcluster/tf_ios-arm64-opt.yml +++ b/taskcluster/tf_ios-arm64-opt.yml @@ -3,8 +3,7 @@ build: cache: artifact_url: ${system.tensorflow.ios_arm64.url} artifact_namespace: ${system.tensorflow.ios_arm64.namespace} - generic: - workerType: "ds-macos-heavy" + workerType: ${macOS.tfBuild} scripts: setup: "taskcluster/tf_tc-setup.sh" build: "taskcluster/tf_tc-build.sh --ios-arm64" diff --git a/taskcluster/tf_ios-x86_64-opt.yml b/taskcluster/tf_ios-x86_64-opt.yml index 8f82cb95..5fb07d3a 100644 --- a/taskcluster/tf_ios-x86_64-opt.yml +++ b/taskcluster/tf_ios-x86_64-opt.yml @@ -3,8 +3,7 @@ build: cache: artifact_url: ${system.tensorflow.ios_x86_64.url} artifact_namespace: ${system.tensorflow.ios_x86_64.namespace} - generic: - workerType: "ds-macos-heavy" + workerType: ${macOS.tfBuild} scripts: setup: "taskcluster/tf_tc-setup.sh" build: "taskcluster/tf_tc-build.sh --ios-x86_64"