Skip to content

Commit 30b530f

Browse files
authored
Merge pull request #54 from sunpy/ci
CI changes
2 parents 8e46d85 + 63ff603 commit 30b530f

File tree

2 files changed

+19
-22
lines changed

2 files changed

+19
-22
lines changed

azure-pipelines.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: $(BuildDefinitionName)_$(Date:yyyyMMdd)$(Rev:.rr)
22

33
schedules:
4-
- cron: "0 0 * * *"
5-
displayName: Daily midnight build
4+
- cron: "0 0 * * 0"
5+
displayName: At 00:00 on Sunday
66
branches:
77
include:
88
- master
@@ -43,7 +43,7 @@ stages:
4343
submodules: false
4444
coverage: codecov
4545
toxdeps: tox-pypi-filter
46-
posargs: -n=4
46+
posargs: -n=1
4747

4848
envs:
4949
- linux: codestyle
@@ -63,7 +63,7 @@ stages:
6363
submodules: false
6464
coverage: codecov
6565
toxdeps: tox-pypi-filter
66-
posargs: -n=4
66+
posargs: -n=1
6767

6868
libraries:
6969
apt:
@@ -80,23 +80,20 @@ stages:
8080

8181
- linux: py38-online
8282

83-
- linux: py38-sunpy
84-
85-
- ${{ if or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual')) }}:
86-
- stage: CronTests
87-
displayName: Cron Tests
88-
dependsOn: [] # Don't wait on other stages
89-
jobs:
90-
- template: run-tox-env.yml@OpenAstronomy
91-
parameters:
92-
default_python: '3.8'
93-
submodules: false
94-
coverage: codecov
95-
toxdeps: tox-pypi-filter
96-
posargs: -n=4
83+
- stage: ThirdPhaseTests
84+
displayName: Stage 3 Tests
85+
dependsOn: SecondPhaseTests
86+
jobs:
87+
- template: run-tox-env.yml@OpenAstronomy
88+
parameters:
89+
default_python: '3.8'
90+
submodules: false
91+
coverage: codecov
92+
toxdeps: tox-pypi-filter
93+
posargs: -n=1
9794

98-
envs:
99-
- linux: py38-devdeps
95+
envs:
96+
- linux: py38-sunpy
10097

10198
# On branches which aren't master, and not Pull Requests, build the wheels but only upload them on tags
10299
- ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), or(ne(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual'))) }}:

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ setenv =
2929
MPLBACKEND = agg
3030
COLUMNS = 180
3131
PYTEST_COMMAND = pytest -vvv -s -ra --pyargs drms --cov-report=xml --cov=drms --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
32-
devdeps,build_docs,online: HOME = {envtmpdir}
32+
build_docs,online: HOME = {envtmpdir}
3333
passenv =
3434
HTTP_PROXY
3535
HTTPS_PROXY
@@ -50,7 +50,7 @@ extras =
5050
commands =
5151
sunpy: pytest -vvv -s -ra --pyargs sunpy.net.jsoc --remote-data=any {posargs}
5252
!online: {env:PYTEST_COMMAND} {posargs}
53-
online: {env:PYTEST_COMMAND} --reruns 2 --reruns-delay 30 --timeout=180 --remote-data=any --email jsoc@cadair.com {posargs}
53+
online: {env:PYTEST_COMMAND} --reruns 2 --reruns-delay 60 --timeout=300 --remote-data=any --email jsoc@cadair.com {posargs}
5454

5555
[testenv:build_docs]
5656
changedir = docs

0 commit comments

Comments
 (0)