Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Resurrect macOS builds on Azure Pipelines #2431

Merged
merged 3 commits into from
Aug 19, 2020
Merged

ci: Resurrect macOS builds on Azure Pipelines #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d261cb2
ci: Resurrect macOS builds on Azure Pipelines
Aug 14, 2020
8ab4662
Force staging tests to run serially
Aug 18, 2020
300519b
Ensure staging tests use localhost
Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,28 @@ jobs:
- bash: scripts/ci/azure/run.sh test
name: Test

#- job: macos
# timeoutInMinutes: 90
# strategy:
# matrix:
# macos1014_xcode103_ninja:
# hostImage: 'macOS-10.14'
# macos1015_xcode111_make:
# hostImage: 'macOS-10.15'
#
# pool:
# vmImage: $[ variables['hostImage'] ]
# steps:
# - bash: scripts/ci/azure/macos-setup.sh
# name: Setup
# - bash: scripts/ci/azure/run.sh update
# name: Update
# - bash: scripts/ci/azure/run.sh configure
# name: Configure
# - bash: scripts/ci/azure/run.sh build
# name: Build
# - bash: scripts/ci/azure/run.sh test
# name: Test
- job: macos
timeoutInMinutes: 90
strategy:
matrix:
macos1014_xcode103_ninja:
hostImage: 'macOS-10.14'
macos1015_xcode111_make:
hostImage: 'macOS-10.15'

pool:
vmImage: $[ variables['hostImage'] ]
steps:
- bash: scripts/ci/azure/macos-setup.sh
name: Setup
- bash: scripts/ci/azure/run.sh update
name: Update
- bash: scripts/ci/azure/run.sh configure
name: Configure
- bash: scripts/ci/azure/run.sh build
name: Build
- bash: scripts/ci/azure/run.sh test
name: Test

- job: linux
timeoutInMinutes: 90
Expand Down
13 changes: 7 additions & 6 deletions scripts/ci/azure/macos-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,22 @@ case "$SYSTEM_JOBNAME" in
;;
esac

echo "Installing CMake Nightly"
curl -L https://cmake.org/files/dev/cmake-3.16.20191218-g8262562-Darwin-x86_64.tar.gz | sudo tar -C /Applications --strip-components=1 -xz

echo "Removing all existing brew packages"
echo "Removing all existing brew package and update teh formule"
brew remove --force $(brew list)
brew update

echo "Installing Kitware Ninja"
brew install ninja
echo "Installing Kitware CMake and Ninja"
brew install cmake ninja

echo "Installing GCC"
brew install gcc

echo "Installing blosc compression"
brew install c-blosc

echo "Installing python and friends"
brew install python numpy

if [[ "$SYSTEM_JOBNAME" =~ .*openmpi.* ]]
then
echo "Installing OpenMPI"
Expand Down
3 changes: 3 additions & 0 deletions scripts/ci/azure/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ then
export OMPI_MCA_hwloc_base_binding_policy=none
fi

# Make sure staging tests use localhost
export ADIOS2_IP=127.0.0.1

echo "**********Env Begin**********"
env | sort
echo "**********Env End************"
Expand Down
2 changes: 2 additions & 0 deletions scripts/ci/gh-actions/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ then
export OMPI_MCA_opal_warn_on_missing_libcuda=0
fi

# Make sure staging tests use localhost
export ADIOS2_IP=127.0.0.1

echo "**********Env Begin**********"
env | sort
Expand Down
5 changes: 4 additions & 1 deletion testing/adios2/engine/staging-common/TestSupp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,10 @@ function(add_common_test basename engine)
set (timeout "30")
endif()

set_tests_properties(${testname} PROPERTIES TIMEOUT ${timeout} ${${basename}_PROPERTIES} )
set_tests_properties(${testname} PROPERTIES
TIMEOUT ${timeout} ${${basename}_PROPERTIES}
RUN_SERIAL TRUE
)
endfunction()

function(from_hex HEX DEC)
Expand Down