Use dedicated docker tag for 6.2.x (#4298)

Use dedicated docker tag for 6.2.x
This commit is contained in:
Hugo van Kemenade 2019-12-25 17:40:23 +02:00 committed by GitHub
commit a9126faa7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 18 deletions

View File

@ -1,6 +1,6 @@
parameters:
docker: '' # defaults for any parameters that aren't specified
dockerTag: 'master'
dockerTag: '6.2.x'
name: ''
vmImage: 'Ubuntu-16.04'

View File

@ -36,18 +36,17 @@ matrix:
- python: '3.5'
name: "3.5 Xenial PYTHONOPTIMIZE=2"
env: PYTHONOPTIMIZE=2
- env: DOCKER="alpine" DOCKER_TAG="master"
- env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5
- env: DOCKER="ubuntu-16.04-xenial-amd64" DOCKER_TAG="master"
- env: DOCKER="ubuntu-18.04-bionic-amd64" DOCKER_TAG="master"
- env: DOCKER="debian-9-stretch-x86" DOCKER_TAG="master"
- env: DOCKER="debian-10-buster-x86" DOCKER_TAG="master"
- env: DOCKER="centos-6-amd64" DOCKER_TAG="master"
- env: DOCKER="centos-7-amd64" DOCKER_TAG="master"
- env: DOCKER="amazon-1-amd64" DOCKER_TAG="master"
- env: DOCKER="amazon-2-amd64" DOCKER_TAG="master"
- env: DOCKER="fedora-29-amd64" DOCKER_TAG="master"
- env: DOCKER="fedora-30-amd64" DOCKER_TAG="master"
- env: DOCKER="alpine" DOCKER_TAG="6.2.x"
- env: DOCKER="arch" DOCKER_TAG="6.2.x" # contains PyQt5
- env: DOCKER="ubuntu-16.04-xenial-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="ubuntu-18.04-bionic-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="debian-9-stretch-x86" DOCKER_TAG="6.2.x"
- env: DOCKER="debian-10-buster-x86" DOCKER_TAG="6.2.x"
- env: DOCKER="centos-6-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="centos-7-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="amazon-1-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="amazon-2-amd64" DOCKER_TAG="6.2.x"
- env: DOCKER="fedora-30-amd64" DOCKER_TAG="6.2.x"
services:
- docker

View File

@ -61,11 +61,6 @@ jobs:
docker: 'amazon-2-amd64'
name: 'amazon_2_amd64'
- template: .azure-pipelines/jobs/test-docker.yml
parameters:
docker: 'fedora-29-amd64'
name: 'fedora_29_amd64'
- template: .azure-pipelines/jobs/test-docker.yml
parameters:
docker: 'fedora-30-amd64'