From f1464e3a1796f8d0d452dc0feb2aef3cc8e7b559 Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 19:53:15 +0000 Subject: [PATCH 01/19] fix lerna version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f43c3128..99284d310 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,7 +58,7 @@ jobs: sudo apt-get install rpm jq devscripts debhelper gem install package_cloud nvm use 14.20.1 - npm install --global lerna yarn + npm install --global lerna@6.0.0 yarn - run: name: Install package dependencies command: | From e321a0797d16fe1b4070cffb16bcfee67719ecee Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 20:10:07 +0000 Subject: [PATCH 02/19] bump st2 version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99284d310..b5760203b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: DEPLOY_PACKAGES: 1 DEB: bionic focal RPM: el7 el8 - ST2_VERSION: "3.6dev" + ST2_VERSION: "3.9dev" ST2_HOST: localhost ST2_PROTOCOL: http ST2_USERNAME: st2admin From 9f6e8952484e0cb6c5bc2bd0b6a4893a9bb6d086 Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 20:32:04 +0000 Subject: [PATCH 03/19] increase sleep --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5760203b..cacb6522f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: name: Start test containers command: | docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 100 + sleep 300 - run: name: Check test containers command: | @@ -105,7 +105,7 @@ jobs: command: | docker-compose -f ~/st2-docker/docker-compose.yml down --rmi docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 100 + sleep 300 - run: name: Recheck test containers command: | From 42c4fb96f5d3af7963ba9cf37589f11e5caa7ef3 Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 20:39:38 +0000 Subject: [PATCH 04/19] extend timeout --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cacb6522f..5b18072eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: name: Start test containers command: | docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 300 + sleep 1000 - run: name: Check test containers command: | @@ -105,7 +105,7 @@ jobs: command: | docker-compose -f ~/st2-docker/docker-compose.yml down --rmi docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 300 + sleep 1000 - run: name: Recheck test containers command: | From 1df18908b74e95a5444b892658d53bfd71b65459 Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 21:00:32 +0000 Subject: [PATCH 05/19] restart docker --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b18072eb..198749898 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,8 +91,9 @@ jobs: - run: name: Start test containers command: | + systemctl restart docker docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 1000 + sleep 600 - run: name: Check test containers command: | @@ -105,7 +106,7 @@ jobs: command: | docker-compose -f ~/st2-docker/docker-compose.yml down --rmi docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 1000 + sleep 600 - run: name: Recheck test containers command: | From 692cf1c52773afc408a7d8b0b3ff0fabbe09b259 Mon Sep 17 00:00:00 2001 From: guzzijones Date: Thu, 28 Sep 2023 21:04:53 +0000 Subject: [PATCH 06/19] docker needs a restart --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 198749898..209df5b74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,7 +91,6 @@ jobs: - run: name: Start test containers command: | - systemctl restart docker docker-compose -f ~/st2-docker/docker-compose.yml up -d sleep 600 - run: From 6e96497f2c85f6aadd412be4c324a3c0594af043 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:07:46 +0100 Subject: [PATCH 07/19] Change "docker-compose up" timeout to 300s --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 209df5b74..cacb6522f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: name: Start test containers command: | docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 600 + sleep 300 - run: name: Check test containers command: | @@ -105,7 +105,7 @@ jobs: command: | docker-compose -f ~/st2-docker/docker-compose.yml down --rmi docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 600 + sleep 300 - run: name: Recheck test containers command: | From 1b53081601bebdc0718ab0db6bb9b88f0cc3cf42 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Wed, 18 Oct 2023 15:26:29 +0100 Subject: [PATCH 08/19] Revert back to 100s timeout for "docker-compose up" --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cacb6522f..b5760203b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,7 @@ jobs: name: Start test containers command: | docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 300 + sleep 100 - run: name: Check test containers command: | @@ -105,7 +105,7 @@ jobs: command: | docker-compose -f ~/st2-docker/docker-compose.yml down --rmi docker-compose -f ~/st2-docker/docker-compose.yml up -d - sleep 300 + sleep 100 - run: name: Recheck test containers command: | From 665e877a7de6ec813a5e1b4ac71deee5df0ced27 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:17:28 +0100 Subject: [PATCH 09/19] Pin lerna@6.0.0 in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6990ee9f3..6bdacc9f9 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: build # yarn now included in later node images npm-install: echo "npm install" - npm install -g lerna + npm install -g lerna@6.0.0 lerna: echo "lerna" From 2073feaba7f825271e2d77966b648600ead09bf1 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:27:13 +0100 Subject: [PATCH 10/19] Rebuild From dc7df652e4fa85cac982241f791669a654364df4 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:29:04 +0100 Subject: [PATCH 11/19] Revert "Pin lerna@6.0.0 in Makefile" This reverts commit 665e877a7de6ec813a5e1b4ac71deee5df0ced27. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bdacc9f9..6990ee9f3 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: build # yarn now included in later node images npm-install: echo "npm install" - npm install -g lerna@6.0.0 + npm install -g lerna lerna: echo "lerna" From dc94482e2414c7aa917b57a2bc418e7da8ddb579 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:30:07 +0100 Subject: [PATCH 12/19] Revert "Revert "Pin lerna@6.0.0 in Makefile"" This reverts commit dc7df652e4fa85cac982241f791669a654364df4. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6990ee9f3..6bdacc9f9 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all: build # yarn now included in later node images npm-install: echo "npm install" - npm install -g lerna + npm install -g lerna@6.0.0 lerna: echo "lerna" From 7b366befd2903711c0baeb0f9e862f9d1f38923c Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:32:58 +0100 Subject: [PATCH 13/19] Debug nvm --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5760203b..8fc550278 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,8 @@ jobs: set +e export NVM_DIR="/opt/circleci/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" + ls $NVM_DIR + whereis nvm nvm install 14.20.1 nvm alias default v14.20.1 From 7d33d39801b8c4114a6168a0d6ba50cc225a41f5 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:33:53 +0100 Subject: [PATCH 14/19] Debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8fc550278..e040ecd56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,9 +32,9 @@ jobs: command: | set +e export NVM_DIR="/opt/circleci/.nvm" - [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" ls $NVM_DIR whereis nvm + [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" nvm install 14.20.1 nvm alias default v14.20.1 From 3b0e8a986cfdcbfaf1475da2cfec31207281b91a Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:35:35 +0100 Subject: [PATCH 15/19] Debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e040ecd56..4df1a4270 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,9 +31,9 @@ jobs: name: Switch to supported version of Node command: | set +e + whereis nvm export NVM_DIR="/opt/circleci/.nvm" ls $NVM_DIR - whereis nvm [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" nvm install 14.20.1 nvm alias default v14.20.1 From ee325a6b0b4c1910b82afd0a2a7288750abbccf0 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:36:20 +0100 Subject: [PATCH 16/19] Debug --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4df1a4270..99e40f1b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: - run: name: Switch to supported version of Node command: | - set +e + set +ex whereis nvm export NVM_DIR="/opt/circleci/.nvm" ls $NVM_DIR From 5a8e2adf2cc450a95c0a374e1ea5314fd9993b67 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:39:06 +0100 Subject: [PATCH 17/19] Debug --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 99e40f1b8..e1f54148c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,6 @@ jobs: - run: name: Switch to supported version of Node command: | - set +ex whereis nvm export NVM_DIR="/opt/circleci/.nvm" ls $NVM_DIR From 23d48f75b288ff4430d93a39bb61b77318b0cac5 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:45:19 +0100 Subject: [PATCH 18/19] Pin machine image to an older working version --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e1f54148c..5addb300a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,9 @@ version: 2 jobs: build: - machine: true + machine: + # pin image to older version as "ubuntu-2204:2023.10.1" breaks on "nvm" step + image: ubuntu-2204:2023.04.2 environment: DEPLOY_PACKAGES: 1 DEB: bionic focal @@ -30,9 +32,8 @@ jobs: - run: name: Switch to supported version of Node command: | - whereis nvm + set +e export NVM_DIR="/opt/circleci/.nvm" - ls $NVM_DIR [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" nvm install 14.20.1 nvm alias default v14.20.1 From 7e7a22217c0f6f7a3e083b4c6b10d8bc1d18d0d8 Mon Sep 17 00:00:00 2001 From: Eugen C <1533818+armab@users.noreply.github.com> Date: Thu, 19 Oct 2023 18:17:09 +0100 Subject: [PATCH 19/19] Add a Changelog for #1008 --- CHANGELOG.rst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7d95c907a..e52ac56eb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,15 @@ Changelog in development -------------- +Fixed +~~~~~ +* Fixed CircleCI tests by pinning lerna@6.0.0. #1008 + + Contributed by @guzzijones + + +st2 v3.8.0 +------ Added ~~~~~ @@ -30,7 +39,6 @@ Changed Reported by @cded from @Bitovi - Fixed ~~~~~ * Fixed CircleCI tests @@ -44,7 +52,3 @@ Fixed * Escaped text in notifications. #990 Contributed by @cded from @Bitovi - - -v2.4.3 -------