Merge pull request #1917 from chuckatkins/ci-fix-xcode-103

CI: Fix Xcode 10.3 builds to use the right dev environment
ornladios · Dec 29, 2019 · 83bcf11 · 83bcf11
2 parents fdf0ea0 + 3940edb
commit 83bcf11
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -46,9 +46,9 @@ jobs:
         hostImage: 'macOS-10.13'
       macos1013_xcode941_openmpi_ninja:
         hostImage: 'macOS-10.13'
-      macos1014_xcode104_ninja:
+      macos1014_xcode103_ninja:
         hostImage: 'macOS-10.14'
-      macos1014_xcode104_openmpi_make:
+      macos1014_xcode103_openmpi_make:
         hostImage: 'macOS-10.14'
   pool:
     vmImage: $[ variables['hostImage'] ]

diff --git a/scripts/ci/azure/run.sh b/scripts/ci/azure/run.sh
@@ -44,13 +44,23 @@ else
   CTEST=ctest
 fi
 
+# macOS tmpdir issues
+# See https://github.com/open-mpi/ompi/issues/6518
+if [[ "{AGENT_OS}" =~ "Darwin" ]]
+then
+  export TMPDIR=/tmp
+fi
+
 # OpenMPI specific setup
 if [[ "${SYSTEM_JOBNAME}" =~ openmpi ]]
 then
   # Workaround to quiet some warnings from OpenMPI
   export OMPI_MCA_btl_base_warn_component_unused=0
   export OMPI_MCA_btl_vader_single_copy_mechanism=none
 
+  # https://github.com/open-mpi/ompi/issues/6518
+  export OMPI_MCA_btl=self,tcp
+
   # Enable overscription in OpenMPI
   export OMPI_MCA_rmaps_base_oversubscribe=1
   export OMPI_MCA_hwloc_base_binding_policy=none

diff --git a/...i/cmake/ci-macos1014-xcode104-ninja.cmake → ...i/cmake/ci-macos1014-xcode103-ninja.cmake b/...i/cmake/ci-macos1014-xcode104-ninja.cmake → ...i/cmake/ci-macos1014-xcode103-ninja.cmake
diff --git a/.../ci-macos1014-xcode104-openmpi-make.cmake → .../ci-macos1014-xcode103-openmpi-make.cmake b/.../ci-macos1014-xcode104-openmpi-make.cmake → .../ci-macos1014-xcode103-openmpi-make.cmake
diff --git a/scripts/ci/gh-actions/run.sh b/scripts/ci/gh-actions/run.sh
@@ -38,13 +38,23 @@ else
   CTEST=ctest
 fi
 
+# macOS tmpdir issues
+# See https://github.com/open-mpi/ompi/issues/6518
+if [[ "{GH_YML_OS}" =~ "macOS" ]]
+then
+  export TMPDIR=/tmp
+fi
+
 # OpenMPI specific setup
 if [[ "${GH_YML_JOBNAME}" =~ openmpi ]]
 then
   # Workaround to quiet some warnings from OpenMPI
   export OMPI_MCA_btl_base_warn_component_unused=0
   export OMPI_MCA_btl_vader_single_copy_mechanism=none
 
+  # https://github.com/open-mpi/ompi/issues/6518
+  export OMPI_MCA_btl=self,tcp
+
   # Enable overscription in OpenMPI
   export OMPI_MCA_rmaps_base_oversubscribe=1
   export OMPI_MCA_hwloc_base_binding_policy=none