BUG: Update CI scripts from current ITK master

Update the AZP CI scripts from 7018660 with an update to the ExternalData version used.
InsightSoftwareConsortium · Aug 23, 2019 · 3213404 · 3213404
1 parent 7aac4a6
commit 3213404
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 57 deletions.
diff --git a/Testing/ContinuousIntegration/AzurePipelinesLinux.yml b/Testing/ContinuousIntegration/AzurePipelinesLinux.yml
@@ -1,10 +1,12 @@
+name: ITK.Linux
+
 trigger:
   branches:
     include:
     - master
     - release*
 variables:
-  ExternalDataVersion: 4.13.1
+  ExternalDataVersion: 4.13.2
 jobs:
 - job: Linux
   timeoutInMinutes: 0
@@ -20,41 +22,61 @@ jobs:
         if [ -n "$(System.PullRequest.SourceCommitId)" ]; then
           git checkout $(System.PullRequest.SourceCommitId)
         fi
-      displayName: Checkout pull request HEAD
-
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
+      displayName: 'Checkout pull request HEAD'
 
     - bash: |
         set -x
-
         sudo pip3 install ninja
         sudo apt-get update
         sudo apt-get install -y python3-venv
+        sudo python3 -m pip install --upgrade setuptools
+        sudo python3 -m pip install scikit-ci-addons
+      displayName: 'Install dependencies'
 
-      displayName: Install dependencies
     - bash: |
         set -x
-
         git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITK.git ITK-dashboard
 
         curl -L https://github.com/InsightSoftwareConsortium/ITK/releases/download/v$(ExternalDataVersion)/InsightData-$(ExternalDataVersion).tar.gz -O
         cmake -E tar xfz InsightData-$(ExternalDataVersion).tar.gz
         cmake -E rename InsightToolkit-$(ExternalDataVersion)/.ExternalData/MD5 $(Build.SourcesDirectory)/.ExternalData/MD5
-
-      displayName: Download dashboard script and testing data
       workingDirectory: $(Agent.BuildDirectory)
+      displayName: 'Download dashboard script and testing data'
+
+    - bash: |
+        cat > dashboard.cmake << EOF
+        set(CTEST_BUILD_CONFIGURATION "MinSizeRel")
+        set(CTEST_CMAKE_GENERATOR "Ninja")
+        set(dashboard_cache "
+          BUILD_SHARED_LIBS:BOOL=OFF
+          BUILD_EXAMPLES:BOOL=OFF
+          ITK_WRAP_PYTHON:BOOL=OFF
+        ")
+        include(\$ENV{AGENT_BUILDDIRECTORY}/ITK-dashboard/azure_dashboard.cmake)
+        EOF
+        cat dashboard.cmake
+      workingDirectory: $(Agent.BuildDirectory)/ITK-dashboard
+      displayName: 'Configure CTest script'
+
     - bash: |
         set -x
 
         c++ --version
         cmake --version
 
-        export BUILD_EXAMPLES=OFF
-        export CTEST_BUILD_CONFIGURATION=MinSizeRel
-        export CTEST_OUTPUT_ON_FAILURE=1
+        ctest -S $(Agent.BuildDirectory)/ITK-dashboard/dashboard.cmake -VV -j 4
+      displayName: 'Build and test'
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1
 
-        ctest -S ITK-dashboard/azure_dashboard.cmake -V -j 4
-      displayName: Build and test
-      workingDirectory: $(Agent.BuildDirectory)
+    - script: |
+        ci_addons ctest_junit_formatter $(Build.SourcesDirectory)-build > $(Agent.BuildDirectory)/JUnitTestResults.xml
+      condition: succeededOrFailed()
+      displayName: 'Format CTest output in JUnit format'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: "$(Agent.BuildDirectory)/JUnitTestResults.xml"
+        testRunTitle: 'CTest $(Agent.OS)'
+      condition: succeededOrFailed()
+      displayName: 'Publish test results'
diff --git a/Testing/ContinuousIntegration/AzurePipelinesMacOS.yml b/Testing/ContinuousIntegration/AzurePipelinesMacOS.yml
@@ -1,10 +1,12 @@
+name: ITK.macOS
+
 trigger:
   branches:
     include:
     - master
     - release*
 variables:
-  ExternalDataVersion: 4.13.1
+  ExternalDataVersion: 4.13.2
 jobs:
 - job: macOS
   timeoutInMinutes: 0
@@ -22,38 +24,57 @@ jobs:
         fi
       displayName: Checkout pull request HEAD
 
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-
     - bash: |
         set -x
-
-        sudo pip3 install ninja
-
+        sudo python3 -m pip install ninja
+        sudo python3 -m pip install --upgrade setuptools
+        sudo python3 -m pip install scikit-ci-addons
       displayName: Install dependencies
+
     - bash: |
         set -x
-
         git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITK.git ITK-dashboard
 
         curl -L https://github.com/InsightSoftwareConsortium/ITK/releases/download/v$(ExternalDataVersion)/InsightData-$(ExternalDataVersion).tar.gz -O
         cmake -E tar xfz InsightData-$(ExternalDataVersion).tar.gz
         cmake -E rename InsightToolkit-$(ExternalDataVersion)/.ExternalData/MD5 $(Build.SourcesDirectory)/.ExternalData/MD5
-
-      displayName: Download dashboard script and testing data
       workingDirectory: $(Agent.BuildDirectory)
-    - script: |
+      displayName: 'Download dashboard script and testing data'
+
+    - bash: |
+        cat > dashboard.cmake << EOF
+        set(CTEST_BUILD_CONFIGURATION "Release")
+        set(CTEST_CMAKE_GENERATOR "Ninja")
+        set(dashboard_cache "
+          BUILD_SHARED_LIBS:BOOL=ON
+          BUILD_EXAMPLES:BOOL=ON
+          ITK_WRAP_PYTHON:BOOL=OFF
+        ")
+        include(\$ENV{AGENT_BUILDDIRECTORY}/ITK-dashboard/azure_dashboard.cmake)
+        EOF
+        cat dashboard.cmake
+      workingDirectory: $(Agent.BuildDirectory)/ITK-dashboard
+      displayName: 'Configure CTest script'
+
+    - bash: |
         set -x
-        xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer/
-        xcode-select -p
+
         c++ --version
         cmake --version
 
-        export BUILD_SHARED_LIBS=ON
-        export CTEST_OUTPUT_ON_FAILURE=1
+        ctest -S $(Agent.BuildDirectory)/ITK-dashboard/dashboard.cmake -VV -j 4
+      displayName: 'Build and test'
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1
 
-        ctest -S ITK-dashboard/azure_dashboard.cmake -V -j 4
-      displayName: Build and test
-      workingDirectory: $(Agent.BuildDirectory)
+    - script: |
+        ci_addons ctest_junit_formatter $(Build.SourcesDirectory)-build > $(Agent.BuildDirectory)/JUnitTestResults.xml
+      condition: succeededOrFailed()
+      displayName: 'Format CTest output in JUnit format'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: "$(Agent.BuildDirectory)/JUnitTestResults.xml"
+        testRunTitle: 'CTest $(Agent.OS)'
+      condition: succeededOrFailed()
+      displayName: 'Publish test results'
diff --git a/Testing/ContinuousIntegration/AzurePipelinesWindows.yml b/Testing/ContinuousIntegration/AzurePipelinesWindows.yml
@@ -1,10 +1,12 @@
+name: ITK.Windows
+
 trigger:
   branches:
     include:
     - master
     - release*
 variables:
-  ExternalDataVersion: 4.13.1
+  ExternalDataVersion: 4.13.2
 jobs:
 - job: Windows
   timeoutInMinutes: 0
@@ -15,39 +17,59 @@ jobs:
     - checkout: self
       clean: true
       fetchDepth: 5
+
     - script: |
         if DEFINED SYSTEM_PULLREQUEST_SOURCECOMMITID git checkout $(System.PullRequest.SourceCommitId)
       displayName: Checkout pull request HEAD
 
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-
     - script: |
-
         pip3 install ninja
+        pip3 install --upgrade setuptools
+        pip3 install scikit-ci-addons
+      displayName: 'Install dependencies'
 
-      displayName: Install dependencies
     - script: |
         git clone -b dashboard --single-branch https://github.com/InsightSoftwareConsortium/ITK.git ITK-dashboard
 
         curl -L https://github.com/InsightSoftwareConsortium/ITK/releases/download/v$(ExternalDataVersion)/InsightData-$(ExternalDataVersion).tar.gz -O
         cmake -E tar xfz InsightData-$(ExternalDataVersion).tar.gz
         cmake -E rename InsightToolkit-$(ExternalDataVersion)/.ExternalData/MD5 $(Build.SourcesDirectory)/.ExternalData/MD5
-
-      displayName: Download dashboard script and testing data
       workingDirectory: $(Agent.BuildDirectory)
+      displayName: 'Download dashboard script and testing data'
+
+    - bash: |
+        cat > dashboard.cmake << EOF
+        set(CTEST_BUILD_CONFIGURATION "MinSizeRel")
+        set(CTEST_CMAKE_GENERATOR "Ninja")
+        set(ENV{CC} cl.exe)
+        set(ENV{CXX} cl.exe)
+        set(dashboard_cache "
+          BUILD_SHARED_LIBS:BOOL=ON
+          BUILD_EXAMPLES:BOOL=OFF
+          ITK_WRAP_PYTHON:BOOL=OFF
+        ")
+        include(\$ENV{AGENT_BUILDDIRECTORY}/ITK-dashboard/azure_dashboard.cmake)
+        EOF
+        cat dashboard.cmake
+      workingDirectory: $(Agent.BuildDirectory)/ITK-dashboard
+      displayName: 'Configure CTest script'
+
     - script: |
         cmake --version
-
         call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        set BUILD_SHARED_LIBS=ON
-        set BUILD_EXAMPLES=OFF
-        set CTEST_BUILD_CONFIGURATION=MinSizeRel
-        set CC=cl.exe
-        set CXX=cl.exe
-        set CTEST_OUTPUT_ON_FAILURE=1
-
-        ctest -S ITK-dashboard/azure_dashboard.cmake -V -j 4
-      displayName: Build and test
-      workingDirectory: $(Agent.BuildDirectory)
+        ctest -S $(Agent.BuildDirectory)/ITK-dashboard/dashboard.cmake -VV -j 4
+      displayName: 'Build and test'
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1
+
+    - script: |
+        ci_addons ctest_junit_formatter $(Build.SourcesDirectory)-build > $(Agent.BuildDirectory)/JUnitTestResults.xml
+      condition: succeededOrFailed()
+      displayName: 'Format CTest output in JUnit format'
+
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFiles: "$(Agent.BuildDirectory)/JUnitTestResults.xml"
+        testRunTitle: 'CTest $(Agent.OS)'
+      condition: succeededOrFailed()
+      displayName: 'Publish test results'