From 1d59b3f0ce185702d69eedef752363f63bc48012 Mon Sep 17 00:00:00 2001
From: Jirka Borovec <Borda@users.noreply.github.com>
Date: Tue, 19 Jul 2022 08:34:36 +0200
Subject: [PATCH] CI: revert skip jobs (#13715)

revert skip jobs
---
 .azure/hpu-tests.yml | 27 +--------------------------
 .azure/ipu-tests.yml | 24 ------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/.azure/hpu-tests.yml b/.azure/hpu-tests.yml
index a6b00b065c..e530ace901 100644
--- a/.azure/hpu-tests.yml
+++ b/.azure/hpu-tests.yml
@@ -14,10 +14,6 @@ pr:
   - "master"
   - "release/*"
 
-variables:
-  - name: continue
-    value: '1'
-
 jobs:
   - job: testing
     # how long to run the job before automatically cancelling
@@ -29,26 +25,10 @@ jobs:
       clean: all
 
     steps:
-    - bash: |
-        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
-        if [ -z "$MATCHES" ]; then
-            echo "Skip"
-            echo "##vso[task.setvariable variable=continue]0"
-        else
-            echo "Continue"
-            echo "##vso[task.setvariable variable=continue]1"
-        fi
-      displayName: Skipper
-
     - bash: |
         apt-get install -y hwinfo
         hwinfo --short
       displayName: 'Instance HW info'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         pip install -e .[extra] -r requirements/pytorch/test.txt
@@ -56,19 +36,16 @@ jobs:
         PACKAGE_NAME: pytorch
         FREEZE_REQUIREMENTS: 1
       displayName: 'Install dependencies'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         python -m pytest -sv accelerators/test_hpu.py --forked --junitxml=hpu1_test-results.xml
       workingDirectory: tests/tests_pytorch
       displayName: 'Single card HPU test'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         python -m pytest -sv accelerators/test_hpu.py --forked --hpus 8 --junitxml=hpu8_test-results.xml
       workingDirectory: tests/tests_pytorch
       displayName: 'Multi card(8) HPU test'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         python -m pytest -sv plugins/precision/hpu/test_hpu.py --hmp-bf16 \
@@ -77,18 +54,16 @@ jobs:
           --junitxml=hpu1_precision_test-results.xml
       workingDirectory: tests/tests_pytorch
       displayName: 'HPU precision test'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         export PYTHONPATH="${PYTHONPATH}:$(pwd)"
         python "pl_hpu/mnist_sample.py"
       workingDirectory: examples
       displayName: 'Testing: HPU examples'
-      condition: eq(variables['continue'], '1')
 
     - task: PublishTestResults@2
       inputs:
         testResultsFiles: 'hpu*_test-results.xml'
         testRunTitle: '$(Agent.OS) - $(Build.DefinitionName) - Python $(python.version)'
-      condition: and(succeededOrFailed(), eq(variables['continue'], '1'))
+      condition: succeededOrFailed()
       displayName: 'Publish test results'
diff --git a/.azure/ipu-tests.yml b/.azure/ipu-tests.yml
index 6ff64874ce..a4d6831883 100644
--- a/.azure/ipu-tests.yml
+++ b/.azure/ipu-tests.yml
@@ -15,8 +15,6 @@ pr:
 variables:
   - name: poplar_sdk
     value: "poplar_sdk-ubuntu_20_04-2.3.1+793-89796d462d"
-  - name: continue
-    value: '1'
 
 jobs:
   - job: testing
@@ -27,31 +25,14 @@ jobs:
       clean: all
 
     steps:
-    - bash: |
-        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
-        if [ -z "$MATCHES" ]; then
-            echo "Skip"
-            echo "##vso[task.setvariable variable=continue]0"
-        else
-            echo "Continue"
-            echo "##vso[task.setvariable variable=continue]1"
-        fi
-      displayName: Skipper
-
     - script: tar -xvzf /opt/poplar/${{ variables.poplar_sdk }}.tar.gz
       displayName: "Extract Poplar SDK"
-      condition: eq(variables['continue'], '1')
 
     - script: |
         set -eux
         pip debug --verbose
         pip install ${{ variables.poplar_sdk }}/poptorch-*ubuntu*.whl
       displayName: "Install poptorch"
-      condition: eq(variables['continue'], '1')
 
     - script: |
         set -eux
@@ -68,7 +49,6 @@ jobs:
             i=$((i + 1))
         done
       displayName: "Reset IPU devices"
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         export GIT_TERMINAL_PROMPT=1
@@ -80,13 +60,11 @@ jobs:
         PACKAGE_NAME: pytorch
         FREEZE_REQUIREMENTS: 1
       displayName: 'Install dependencies'
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         python requirements/collect_env_details.py
         python -c "import torch"
       displayName: 'Env details'
-      condition: eq(variables['continue'], '1')
 
     - script: |
         set -eux
@@ -94,7 +72,6 @@ jobs:
         source ${{ variables.poplar_sdk }}/popart-ubuntu*/enable.sh
         python -c "import poptorch; print(poptorch.__version__)"
       displayName: "Check poptorch installation"
-      condition: eq(variables['continue'], '1')
 
     - bash: |
         source ${{ variables.poplar_sdk }}/poplar-ubuntu*/enable.sh
@@ -105,4 +82,3 @@ jobs:
         POPTORCH_WAIT_FOR_IPU: 1
         PL_RUN_IPU_TESTS: 1
       displayName: 'Testing: PyTorch standard'
-      condition: eq(variables['continue'], '1')