From 7a0a2e966ce4f67e085df6f4c9bf3d0c8e433072 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Dec 2019 23:41:45 +1100 Subject: [PATCH 1/3] Changed docker tag to 6.2.x --- .azure-pipelines/jobs/test-docker.yml | 2 +- .travis.yml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/jobs/test-docker.yml b/.azure-pipelines/jobs/test-docker.yml index 41dc2daec..defb8d3ae 100644 --- a/.azure-pipelines/jobs/test-docker.yml +++ b/.azure-pipelines/jobs/test-docker.yml @@ -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' diff --git a/.travis.yml b/.travis.yml index 3ce2ffcd4..b69e646fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,18 @@ 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-29-amd64" DOCKER_TAG="6.2.x" + - env: DOCKER="fedora-30-amd64" DOCKER_TAG="6.2.x" services: - docker From fe8ba74f938bb7cefc858a736ae6888413701fd3 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Thu, 26 Dec 2019 00:50:23 +1100 Subject: [PATCH 2/3] Removed EOL Fedora 29 Co-Authored-By: Hugo van Kemenade --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b69e646fe..e9b297185 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ matrix: - 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-29-amd64" DOCKER_TAG="6.2.x" - env: DOCKER="fedora-30-amd64" DOCKER_TAG="6.2.x" services: From 89d6c84ba0254fb5f1062f2ce5801dee09d1e7b3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 26 Dec 2019 00:51:11 +1100 Subject: [PATCH 3/3] Removed EOL Fedora 29 --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f26f2c037..b1be91534 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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'