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

Use catalina for some osx jobs #3591

Merged
merged 19 commits into from
Feb 26, 2020
Merged

Use catalina for some osx jobs #3591

Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
170ad63
Add catalina job
mtreinish Dec 10, 2019
a4a5f38
Merge branch 'master' into add-catalina-job
mtreinish Dec 12, 2019
4399077
Merge branch 'master' into add-catalina-job
kdk Jan 7, 2020
bcbaddb
Update azure-pipelines.yml
mtreinish Jan 8, 2020
e028a9b
Merge branch 'master' into add-catalina-job
mtreinish Jan 8, 2020
8ca4f1d
Use Mojave for all second stage osx jobs
mtreinish Jan 8, 2020
a6532e4
Merge branch 'master' into add-catalina-job
mtreinish Jan 31, 2020
e8b30fa
Merge branch 'master' into add-catalina-job
mtreinish Feb 6, 2020
5c6662a
Pivot to macos 10.15 catalina
mtreinish Feb 6, 2020
d5029e3
Merge branch 'master' into add-catalina-job
mtreinish Feb 15, 2020
1f3ba87
Use conda for macOS jobs
mtreinish Feb 15, 2020
8dfd67a
Install scipy via conda too
mtreinish Feb 24, 2020
4aad45c
Merge branch 'master' into add-catalina-job
mtreinish Feb 24, 2020
76d671a
Switch back to 10.14 again
mtreinish Feb 24, 2020
f1d182a
Merge branch 'master' into add-catalina-job
mtreinish Feb 26, 2020
e903f98
Switch back to 10.15 without conda
mtreinish Feb 26, 2020
7731b5f
Merge branch 'master' into add-catalina-job
mtreinish Feb 26, 2020
48f28c9
Merge branch 'master' into add-catalina-job
mtreinish Feb 26, 2020
7080e90
Merge branch 'master' into add-catalina-job
mtreinish Feb 26, 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
32 changes: 27 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
TWINE_PASSWORD: $(TWINE_PASSWORD)
- job: 'macos'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
pool: {vmImage: 'macOS-10.13'}
pool: {vmImage: 'macOS-10.15'}
variables:
python.version: '3.7'
CIBW_BEFORE_BUILD: pip install -U Cython
Expand Down Expand Up @@ -222,8 +222,8 @@ stages:
inputs:
pathtoPublish: 'docs/_build/html'
artifactName: 'html_docs'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand All @@ -234,8 +234,17 @@ stages:
inputs:
versionSpec: '$(python.version)'
displayName: 'Use Python $(python.version)'
- bash: echo "##vso[task.prependpath]$CONDA/bin"
displayName: Add conda to PATH
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it just echos the conda path. Maybe it doesn't need to be added to PATH?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copied this from: https://docs.microsoft.com/en-us/azure/devops/pipelines/ecosystems/anaconda?view=azure-devops&tabs=macos

- 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 .
Expand All @@ -244,6 +253,7 @@ 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
Expand All @@ -262,6 +272,7 @@ 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
Expand Down Expand Up @@ -386,8 +397,8 @@ stages:
inputs:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Test results for Linux Python $(python.version)'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand All @@ -402,8 +413,17 @@ 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 .
Expand All @@ -412,6 +432,7 @@ 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
Expand All @@ -430,6 +451,7 @@ 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
Expand Down