Merge pull request #2913 from chuckatkins/fix-ci

Fix Azure CI pipelines
ornladios · Oct 20, 2021 · 61f0e85 · 61f0e85
2 parents dbb0ee6 + bec1e60
commit 61f0e85
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,7 +20,7 @@ resources:
 
 jobs:
 - job: windows
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   strategy:
     matrix:
       win2016_vs2017:
@@ -48,7 +48,7 @@ jobs:
       name: Test
 
 - job: macos
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   strategy:
     matrix:
       macos1014_xcode103_ninja:
@@ -71,13 +71,15 @@ jobs:
       name: Test
 
 - job: linux
-  timeoutInMinutes: 90
+  timeoutInMinutes: 120
   strategy:
     matrix:
       el7_intel_ohpc:
         containerResource: el7-intel-ohpc
       el7_intel_openmpi_ohpc:
         containerResource: el7-intel-openmpi-ohpc
+  pool:
+    vmImage: 'ubuntu-latest'
   container: $[ variables['containerResource'] ]
   steps:
     - bash: scripts/ci/azure/linux-setup.sh

diff --git a/scripts/ci/cmake/ci-power8-el7-pgi-smpi.cmake b/scripts/ci/cmake/ci-power8-el7-pgi-smpi.cmake
@@ -33,6 +33,7 @@ set(CTEST_TEST_ARGS
   PARALLEL_LEVEL 1
   INCLUDE "^(Interface|Install)"
 )
+set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake/ci-power8-el7-pgi.cmake b/scripts/ci/cmake/ci-power8-el7-pgi.cmake
@@ -22,6 +22,7 @@ ADIOS2_USE_ZFP:BOOL=ON
 set(CTEST_TEST_ARGS
   INCLUDE "^(Interface|Install)"
 )
+set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake/ci-power8-el7-xl-smpi.cmake b/scripts/ci/cmake/ci-power8-el7-xl-smpi.cmake
@@ -30,6 +30,7 @@ set(CTEST_TEST_ARGS
   PARALLEL_LEVEL 1
   INCLUDE "^(Interface|Install)"
 )
+set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/ci/cmake/ci-power8-el7-xl.cmake b/scripts/ci/cmake/ci-power8-el7-xl.cmake
@@ -20,6 +20,7 @@ ADIOS2_USE_ZFP:BOOL=ON
 set(CTEST_TEST_ARGS
   INCLUDE "^(Interface|Install)"
 )
+set(CTEST_TEST_TIMEOUT 300)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)
diff --git a/scripts/dashboard/adios_common.cmake b/scripts/dashboard/adios_common.cmake
@@ -69,7 +69,7 @@ if(NOT dashboard_git_url)
 endif()
 
 if(NOT DEFINED CTEST_TEST_TIMEOUT)
-  set(CTEST_TEST_TIMEOUT 300)
+  set(CTEST_TEST_TIMEOUT 120)
 endif()
 if(NOT DEFINED CTEST_SUBMIT_NOTES) 
   set(CTEST_SUBMIT_NOTES TRUE)