Simplify config

This commit is contained in:
Adrien Ferrand 2020-04-25 22:58:26 +02:00
parent 8d871a9abe
commit 0ece985caf

View file

@ -24,73 +24,63 @@ jobs:
unbuffer -p python -m tox
displayName: Run tox
- job: extended_test
variables:
${{ if eq(variables['TOXENV'], 'integration') }}:
PYTEST_ADDOPTS: --numprocesses 4
strategy:
matrix:
linux-py36:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.6
TOXENV: py36
linux-py37:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.7
TOXENV: py37
linux-py37-nopin:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.7
TOXENV: py37
CERTBOT_NO_PIN: 1
linux-boulder-v1-py27-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 2.7
TOXENV: integration
ACME_SERVER: boulder-v1
linux-boulder-v2-py27-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 2.7
TOXENV: integration
ACME_SERVER: boulder-v2
linux-boulder-v1-py35-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.5
TOXENV: integration
ACME_SERVER: boulder-v1
linux-boulder-v2-py35-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.5
TOXENV: integration
ACME_SERVER: boulder-v2
linux-boulder-v1-py36-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.6
TOXENV: integration
ACME_SERVER: boulder-v1
linux-boulder-v2-py36-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.6
TOXENV: integration
ACME_SERVER: boulder-v2
linux-boulder-v1-py37-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.7
TOXENV: integration
ACME_SERVER: boulder-v1
linux-boulder-v2-py37-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.7
TOXENV: integration
ACME_SERVER: boulder-v2
linux-boulder-v1-py38-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.8
TOXENV: integration
ACME_SERVER: boulder-v1
linux-boulder-v2-py38-integration:
IMAGE_NAME: ubuntu-18.04
PYTHON_VERSION: 3.8
TOXENV: integration
ACME_SERVER: boulder-v2
pool:
vmImage: $(IMAGE_NAME)
vmImage: ubuntu-18.04
steps:
- bash: |
sudo apt-get update
@ -103,7 +93,6 @@ jobs:
ca-certificates \
nginx-light \
openssl
condition: startswith(variables['IMAGE_NAME'], 'ubuntu')
displayName: Install Linux dependencies
- task: UsePythonVersion@0
inputs:
@ -115,10 +104,13 @@ jobs:
- script: |
python -m tox
displayName: Run tox
- job: oldest_extended_test
pool:
vmImage: ubuntu-latest
strategy:
variables:
PYTEST_ADDOPTS: --numprocesses 4
matrix:
linux-boulder-v1-integration-certbot:
TOXENV: integration-certbot-oldest