From 49f327b9f768f966035af6ecacec655b7800ad95 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Thu, 7 Jan 2021 12:01:55 +0000 Subject: [PATCH] Make sure previous tc-workdir is fresh before starting Darwin tasks --- taskcluster/.shared.yml | 24 +++++++++---------- taskcluster/darwin-opt-base.tyml | 2 +- .../generic_tc_caching-darwin-opt-base.tyml | 2 +- taskcluster/test-darwin-opt-base.tyml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index 7fee9f6d..cfa38ab7 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -197,8 +197,8 @@ system: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.arm64/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.arm64" darwin_amd64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.osx/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.osx" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.1.osx/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.1.osx" android_arm64: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.android-arm64/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.android-arm64" @@ -212,11 +212,11 @@ system: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.win-cuda/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.win-cuda" ios_arm64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_arm64/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_arm64" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_arm64/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_arm64" ios_x86_64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_x86_64/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_x86_64" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_x86_64/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_x86_64" tensorflow_gcc9: linux_amd64_cpu: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.cpu_gcc9/artifacts/public/home.tar.xz" @@ -238,8 +238,8 @@ system: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.arm64/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.arm64" darwin_amd64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.osx/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.osx" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.1.osx/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.1.osx" android_arm64: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.android-arm64/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.android-arm64" @@ -253,11 +253,11 @@ system: url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.win-cuda/artifacts/public/home.tar.xz" namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.win-cuda" ios_arm64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_arm64/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_arm64" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_arm64/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_arm64" ios_x86_64: - url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_x86_64/artifacts/public/home.tar.xz" - namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.0.ios_x86_64" + url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_x86_64/artifacts/public/home.tar.xz" + namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.4c4c6accdd524ac50150860031184bb1b17a0350.2.ios_x86_64" username: 'build-user' homedir: linux: '/home/build-user' diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index dbccbb34..0104e414 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -42,7 +42,7 @@ payload: - > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && + (ls -lh .. && rm -fr ../tc-workdir && mkdir ../tc-workdir && ls -lh ..) && cd ../tc-workdir && export TASKCLUSTER_TASK_DIR="$(pwd)" && export LC_ALL=C && export MACOSX_DEPLOYMENT_TARGET=10.10 && diff --git a/taskcluster/generic_tc_caching-darwin-opt-base.tyml b/taskcluster/generic_tc_caching-darwin-opt-base.tyml index 5d40ee9f..57831eac 100644 --- a/taskcluster/generic_tc_caching-darwin-opt-base.tyml +++ b/taskcluster/generic_tc_caching-darwin-opt-base.tyml @@ -30,7 +30,7 @@ payload: in: > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && + (ls -lh .. && rm -fr ../tc-workdir && mkdir ../tc-workdir && ls -lh ..) && cd ../tc-workdir && export TASKCLUSTER_TASK_DIR="$(pwd)" && export LC_ALL=C && export MACOSX_DEPLOYMENT_TARGET=10.10 && diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml index e9ddd08f..62e8e32c 100644 --- a/taskcluster/test-darwin-opt-base.tyml +++ b/taskcluster/test-darwin-opt-base.tyml @@ -40,7 +40,7 @@ then: in: > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && + (ls -lh .. && rm -fr ../tc-workdir && mkdir ../tc-workdir && ls -lh ..) && cd ../tc-workdir && export TASKCLUSTER_TASK_DIR="$(pwd)" && export TASKCLUSTER_TMP_DIR="$TASKCLUSTER_TASK_DIR/tmp" && export LC_ALL=C &&