From c83da71fe66f55c7d2cfd5ca3f18b68742d235cc Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 10 Jun 2021 21:57:12 +0100 Subject: [PATCH 1/5] Remove xenial --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bde4a90784..b09ee87ffb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -116,7 +116,7 @@ jobs: - image: circleci/python:3.6 working_directory: ~/st2 environment: - - DISTROS: "xenial bionic el7 el8" + - DISTROS: "bionic 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: "xenial bionic el7 el8" + - DISTROS: "bionic el7 el8" steps: - attach_workspace: at: . From 9ce5e3e7c2302484344b8d35107acc40c77069c9 Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 10 Jun 2021 22:05:41 +0100 Subject: [PATCH 2/5] Update parallel number --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b09ee87ffb..fb83f4fe5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: # 'machine' executor runs Unit tests ~x1.5 faster, comparing to 'docker' executor # but the fastest is still ~x1.5-2 slower, comparing to Travis machine: true - parallelism: 4 + parallelism: 3 working_directory: ~/st2 steps: - checkout From 7889c1ca76b5f2c0ce9079c0949cf3ab3097f94a Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 10 Jun 2021 22:08:23 +0100 Subject: [PATCH 3/5] Fix parallelism --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb83f4fe5d..27b45da1dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,7 +107,7 @@ jobs: # Build & Test st2 packages packages: - parallelism: 4 + parallelism: 3 # 4CPUs & 8GB RAM CircleCI machine # sadly, it doesn't work with 'setup_remote_docker' resource_class: large From 6de49d9efca24014f39d97f1f8dab84736d69444 Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 10 Jun 2021 22:35:47 +0100 Subject: [PATCH 4/5] Add focal to packages --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27b45da1dd..cdcf0a2431 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,7 +107,7 @@ jobs: # Build & Test st2 packages packages: - parallelism: 3 + parallelism: 4 # 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:3.6 working_directory: ~/st2 environment: - - DISTROS: "bionic el7 el8" + - DISTROS: "bionic focal 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: "bionic el7 el8" + - DISTROS: "bionic focal el7 el8" steps: - attach_workspace: at: . From 00b6eda2347237e684ccbcd692f0213acab728d4 Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 10 Jun 2021 23:29:44 +0100 Subject: [PATCH 5/5] Address review comments --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cdcf0a2431..4e1c4d4105 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: # 'machine' executor runs Unit tests ~x1.5 faster, comparing to 'docker' executor # but the fastest is still ~x1.5-2 slower, comparing to Travis machine: true - parallelism: 3 + parallelism: 4 working_directory: ~/st2 steps: - checkout