From e3d1356e671d7d80fcde51fe4dfc44ed66420aa3 Mon Sep 17 00:00:00 2001 From: thomas chaton Date: Fri, 15 Jul 2022 10:17:33 +0100 Subject: [PATCH] [Hot Fix] Resolve Skipper CI (#13670) --- .azure/gpu-tests.yml | 8 ++++++-- .azure/hpu-tests.yml | 8 ++++++-- .azure/ipu-tests.yml | 10 ++++++---- .github/workflows/ci-pytorch_test-conda.yml | 2 +- .github/workflows/ci-pytorch_test-full.yml | 2 +- .github/workflows/ci-pytorch_test-slow.yml | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.azure/gpu-tests.yml b/.azure/gpu-tests.yml index 2d6af6001e..6cf650936b 100644 --- a/.azure/gpu-tests.yml +++ b/.azure/gpu-tests.yml @@ -17,6 +17,10 @@ pr: - "master" - "release/*" +variables: + - name: continue + value: '1' + jobs: - job: testing strategy: @@ -39,8 +43,8 @@ jobs: steps: - bash: | - CHANGED_FILES=$(git diff --name-status master | awk '{print $2}') - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + CHANGED_FILES=$(git diff --name-status origin/master -- . | awk '{print $2}') + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo $CHANGED_FILES > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.azure/hpu-tests.yml b/.azure/hpu-tests.yml index 03d0db6ee6..a6b00b065c 100644 --- a/.azure/hpu-tests.yml +++ b/.azure/hpu-tests.yml @@ -14,6 +14,10 @@ pr: - "master" - "release/*" +variables: + - name: continue + value: '1' + jobs: - job: testing # how long to run the job before automatically cancelling @@ -26,8 +30,8 @@ jobs: steps: - bash: | - CHANGED_FILES=$(git diff --name-status master | awk '{print $2}') - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + CHANGED_FILES=$(git diff --name-status origin/master -- . | awk '{print $2}') + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo $CHANGED_FILES > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.azure/ipu-tests.yml b/.azure/ipu-tests.yml index fbc6b78215..6ff64874ce 100644 --- a/.azure/ipu-tests.yml +++ b/.azure/ipu-tests.yml @@ -13,8 +13,10 @@ pr: - release/* variables: -- name: poplar_sdk - value: "poplar_sdk-ubuntu_20_04-2.3.1+793-89796d462d" + - name: poplar_sdk + value: "poplar_sdk-ubuntu_20_04-2.3.1+793-89796d462d" + - name: continue + value: '1' jobs: - job: testing @@ -26,8 +28,8 @@ jobs: steps: - bash: | - CHANGED_FILES=$(git diff --name-status master | awk '{print $2}') - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + CHANGED_FILES=$(git diff --name-status origin/master -- . | awk '{print $2}') + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo $CHANGED_FILES > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index 4369ccce93..082edd0f45 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -44,7 +44,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 99e0fe5c6a..6b12525d3f 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -41,7 +41,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index 4de7666d50..c21c482a7d 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -36,7 +36,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES