fix

Author: ant0nsc

azure-pipelines/build-pr.yml

@@ -54,19 +54,19 @@ jobs:
           pytest_mark: after_training_single_run
           test_run_title: tests_after_training_single_run
 
-  - job: RunGpuTestsInAzureML
+  - job: RunAllTestsInAzureML
     dependsOn: CancelPreviousJobs
     variables:
       - name: tag
-        value: 'RunGpuTests'
+        value: 'RunAllTests'
     pool:
       vmImage: 'ubuntu-18.04'
     steps:
       - template: train_template.yml
         parameters:
           wait_for_completion: 'True'
-          pytest_mark: 'gpu or cpu_and_gpu or azureml'
-          max_run_duration: '30m'
+          pytest_mark: 'not (after_training_single_run or after_training_ensemble_run or inference or after_training_2node or after_training_glaucoma_cv_run or after_training_hello_container)'
+          max_run_duration: '40m'
       - task: PublishTestResults@2
         inputs:
           testResultsFiles: '**/test-*.xml'

azure-pipelines/build.yaml

@@ -30,18 +30,18 @@ steps:
     condition: succeededOrFailed()
     displayName: Install InnerEye (Dev) Package
 
-  # First run all tests that require the InnerEye package. All code should be consumed via the InnerEye package,
-  # hence don't set PYTHONPATH to InnerEye - but do set it to hi-ml if that has been included as a submodule for dev
-  # work on the package
-  - bash: |
-      source activate InnerEye
-      pytest ./Tests/ -m "not (gpu or azureml or after_training_single_run or after_training_ensemble_run or inference or after_training_2node or after_training_glaucoma_cv_run or after_training_hello_container)" --doctest-modules --junitxml=junit/test-results.xml --cov=. --cov-config=.coveragerc --cov-report=xml --verbose
-    env:
-      APPLICATION_KEY: $(InnerEyeDeepLearningServicePrincipalKey)
-      DATASETS_ACCOUNT_KEY: $(InnerEyePublicDatasetsStorageKey)
-    failOnStderr: false
-    condition: succeededOrFailed()
-    displayName: Run pytests on InnerEye package
+  # # First run all tests that require the InnerEye package. All code should be consumed via the InnerEye package,
+  # # hence don't set PYTHONPATH to InnerEye - but do set it to hi-ml if that has been included as a submodule for dev
+  # # work on the package
+  # - bash: |
+  #     source activate InnerEye
+  #     pytest ./Tests/ -m "not (gpu or azureml or after_training_single_run or after_training_ensemble_run or inference or after_training_2node or after_training_glaucoma_cv_run or after_training_hello_container)" --doctest-modules --junitxml=junit/test-results.xml --cov=. --cov-config=.coveragerc --cov-report=xml --verbose
+  #   env:
+  #     APPLICATION_KEY: $(InnerEyeDeepLearningServicePrincipalKey)
+  #     DATASETS_ACCOUNT_KEY: $(InnerEyePublicDatasetsStorageKey)
+  #   failOnStderr: false
+  #   condition: succeededOrFailed()
+  #   displayName: Run pytests on InnerEye package
 
   # Run all tests for code that does not live in the InnerEye package. For that, set PYTHONPATH
   - bash: |