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.

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

Use catalina for some osx jobs #3591

Merged
merged 19 commits into from
Feb 26, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Switch back to 10.15 without conda
Now that we have a fix for the random segfaulting in the quantum info
tests there shouldn't be a reason we need to keep running in conda. At
the same time this switches back to 10.15 to test the newest version of
macOS. This only reverted back to 10.14 briefly to see if the segfault
was isolated to 10.15, which it was not.
mtreinish committed Feb 26, 2020

Verified

This commit was signed with the committer’s verified signature.
mtreinish Matthew Treinish
commit e903f98c272aa0a60f93e0ffc776054abe6f7e06
28 changes: 3 additions & 25 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ stages:
TWINE_PASSWORD: $(TWINE_PASSWORD)
- job: 'macos'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
pool: {vmImage: 'macOS-10.14'}
pool: {vmImage: 'macOS-10.15'}
variables:
python.version: '3.7'
CIBW_BEFORE_BUILD: pip install -U Cython
@@ -223,7 +223,7 @@ stages:
pathtoPublish: 'docs/_build/html'
artifactName: 'html_docs'
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.14'}
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
@@ -234,17 +234,8 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
- bash: sudo chown -R $USER $CONDA
displayName: Take ownership of conda installation
- script: conda create --yes --quiet --name qiskit-terra python=$(python.version)
displayName: Create Anaconda environment
- bash: |
set -e
source activate qiskit-terra
conda update --yes -n base conda
conda install --yes --quiet --name qiskit-terra python=$(python.version) numpy scipy
python -m pip install --upgrade pip
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
@@ -253,7 +244,6 @@ stages:
displayName: 'Install dependencies'
- bash: |
set -e
source activate qiskit-terra
export PYTHONHASHSEED=$(python -S -c "import random; print(random.randint(1, 4294967295))")
echo "PYTHONHASHSEED=$PYTHONHASHSEED"
stestr run
@@ -272,7 +262,6 @@ stages:
artifactName: 'drop_macos'
- bash: |
set -e
source activate qiskit-terra
pip install -U junitxml
mkdir -p junit
stestr last --subunit | tools/subunit_to_junit.py -o junit/test-results.xml
@@ -398,7 +387,7 @@ stages:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Test results for Linux Python $(python.version)'
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.14'}
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
@@ -413,17 +402,8 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
- bash: sudo chown -R $USER $CONDA
displayName: Take ownership of conda installation
- script: conda create --yes --quiet --name qiskit-terra python=$(python.version)
displayName: Create Anaconda environment
- bash: |
set -e
source activate qiskit-terra
conda update --yes -n base conda
conda install --yes --quiet --name qiskit-terra python=$(python.version) numpy scipy
python -m pip install --upgrade pip
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
pip install -c constraints.txt -e .
@@ -432,7 +412,6 @@ stages:
displayName: 'Install dependencies'
- bash: |
set -e
source activate qiskit-terra
export PYTHONHASHSEED=$(python -S -c "import random; print(random.randint(1, 4294967295))")
echo "PYTHONHASHSEED=$PYTHONHASHSEED"
stestr run --concurrency 2
@@ -451,7 +430,6 @@ stages:
artifactName: 'drop_macos'
- bash: |
set -e
source activate qiskit-terra
pip install -U junitxml
mkdir -p junit
stestr last --subunit | tools/subunit_to_junit.py -o junit/test-results.xml