From 6fa58f89a83de2915cf6300c14ddc527ff805f71 Mon Sep 17 00:00:00 2001 From: blag Date: Fri, 27 Mar 2020 13:35:56 -0700 Subject: [PATCH 1/2] Don't test or build Ubuntu 14 packages --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b04158a19a..500b4f7fdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,7 +107,7 @@ jobs: # Build & Test st2 packages packages: - parallelism: 6 + parallelism: 5 # 4CPUs & 8GB RAM CircleCI machine # sadly, it doesn't work with 'setup_remote_docker' resource_class: large @@ -116,7 +116,7 @@ jobs: - image: circleci/python:2.7 working_directory: ~/st2 environment: - - DISTROS: "trusty xenial bionic el6 el7 el8" + - DISTROS: "xenial bionic el6 el7 el8" - ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages - ST2_PACKAGES: "st2" - ST2_CHECKOUT: 0 @@ -232,7 +232,7 @@ jobs: - image: circleci/ruby:2.4 working_directory: /tmp/deploy environment: - - DISTROS: "trusty xenial bionic el6 el7" + - DISTROS: "xenial bionic el6 el7" steps: - attach_workspace: at: . From e1db0991be7c62c9ff0ba88d243d774abfb45fc7 Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 2 Apr 2020 16:16:55 -0700 Subject: [PATCH 2/2] Update CHANGELOG.rst --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 79ea9b0362..33f8fbf5e9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -118,6 +118,11 @@ Fixed * Fix dependency conflicts by updating ``requests`` (2.23.0) and ``gitpython`` (2.1.15). #4869 +Removed +~~~~~~~ + +* Removed Ubuntu 14.04 from test matrix #4897 + 3.1.0 - June 27, 2019 ---------------------