From 308cfb1484f6110d00f71e1e050718c80dede77d Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 13:30:56 +0000 Subject: [PATCH 1/6] Build EL9 packages --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d688a57f36..758af3ff69 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: 2 + parallelism: 3 working_directory: ~/st2 steps: - checkout @@ -107,7 +107,7 @@ jobs: # Build & Test st2 packages packages: - parallelism: 2 + parallelism: 3 # 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: "focal el8" + - DISTROS: "focal el8 el9" - ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages - ST2_PACKAGES: "st2" - ST2_CHECKOUT: 0 @@ -222,7 +222,7 @@ jobs: - image: circleci/ruby:2.7 working_directory: /tmp/deploy environment: - - DISTROS: "focal el8" + - DISTROS: "focal el8 el9" steps: - attach_workspace: at: . From fcf25423d271a16faee99c2b5d0fbb0cf74c11fe Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 14:04:07 +0000 Subject: [PATCH 2/6] Use different remote docker and docker compose --- .circleci/config.yml | 21 ++++++++++++++++++--- CHANGELOG.rst | 2 ++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 758af3ff69..0f2726bb39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -113,7 +113,7 @@ jobs: resource_class: large docker: # The primary container is an instance of the first list image listed. Your build commands run in this container. - - image: circleci/python:3.6 + - image: circleci/python:3.8 working_directory: ~/st2 environment: - DISTROS: "focal el8 el9" @@ -124,16 +124,31 @@ jobs: - BASH_ENV: ~/.buildenv steps: - checkout + - run: + name: Install latest Docker Compose V2 + command: | + set -x + export CODENAME=$(source /etc/os-release && echo "$VERSION_CODENAME") + export DISTRO=$(source /etc/os-release && echo "$ID") + export ARCH=$(dpkg --print-architecture) + # get gpg key for download.docker + curl -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt + # set source list + sudo tee <<<"deb [arch=${ARCH}] https://download.docker.com/linux/${DISTRO} ${CODENAME} sta + # update package list + sudo apt update + # install docker CLI and Docker Compose v2 + sudo apt install docker-ce-cli docker-compose-plugin - setup_remote_docker: reusable: true # default - false exclusive: true # default - true - version: 19.03.14 + version: docker24 - run: name: Docker version command: | set -x docker --version - docker-compose --version + docker compose --version - run: name: Download st2-packages repository command: | diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4cc36777b5..bb04eb2e92 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,6 +21,8 @@ Added to pants' use of PEX lockfiles. This is not a user-facing addition. #6118 #6141 #6133 Contributed by @cognifloyd +* Build of ST2 EL9 packages #6153 + Contributed by @amanda11 3.8.1 - December 13, 2023 ------------------------- From b74aec063e924324355a6c3d353436cef225e405 Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 14:09:20 +0000 Subject: [PATCH 3/6] Remove docker compose install that was hanging --- .circleci/config.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f2726bb39..e501a80419 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,21 +124,6 @@ jobs: - BASH_ENV: ~/.buildenv steps: - checkout - - run: - name: Install latest Docker Compose V2 - command: | - set -x - export CODENAME=$(source /etc/os-release && echo "$VERSION_CODENAME") - export DISTRO=$(source /etc/os-release && echo "$ID") - export ARCH=$(dpkg --print-architecture) - # get gpg key for download.docker - curl -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt - # set source list - sudo tee <<<"deb [arch=${ARCH}] https://download.docker.com/linux/${DISTRO} ${CODENAME} sta - # update package list - sudo apt update - # install docker CLI and Docker Compose v2 - sudo apt install docker-ce-cli docker-compose-plugin - setup_remote_docker: reusable: true # default - false exclusive: true # default - true From 9ba8b179c386ea6977c318371b17150f191b3582 Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 14:16:58 +0000 Subject: [PATCH 4/6] Add back in docker compose 2 --- .circleci/config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e501a80419..fe96bd0c89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,6 +124,21 @@ jobs: - BASH_ENV: ~/.buildenv steps: - checkout + - run: + name: Install latest Docker Compose V2 + command: | + set -x + export CODENAME=$(source /etc/os-release && echo "$VERSION_CODENAME") + export DISTRO=$(source /etc/os-release && echo "$ID") + export ARCH=$(dpkg --print-architecture) + # get gpg key for download.docker + url -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/download.docker.gpg + # set source list + sudo tee <<<"deb [arch=${ARCH}] https://download.docker.com/linux/${DISTRO} ${CODENAME} stable" /etc/apt/sources.list.d/download.docker.list + # update package list + sudo apt update + # install docker CLI and Docker Compose v2 + sudo apt install docker-ce-cli docker-compose-plugin - setup_remote_docker: reusable: true # default - false exclusive: true # default - true From 2f63d9e618749b6797514c632a75578611d55918 Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 14:18:30 +0000 Subject: [PATCH 5/6] Add back in docker compose 2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe96bd0c89..b51b1a48a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -132,7 +132,7 @@ jobs: export DISTRO=$(source /etc/os-release && echo "$ID") export ARCH=$(dpkg --print-architecture) # get gpg key for download.docker - url -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/download.docker.gpg + curl -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/download.docker.gpg # set source list sudo tee <<<"deb [arch=${ARCH}] https://download.docker.com/linux/${DISTRO} ${CODENAME} stable" /etc/apt/sources.list.d/download.docker.list # update package list From 01ae8aeb32a6c035f97558dd4349bd8dc8757557 Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 23 Feb 2024 14:27:09 +0000 Subject: [PATCH 6/6] Update docker versin --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b51b1a48a7..62d8afc6fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -148,7 +148,7 @@ jobs: command: | set -x docker --version - docker compose --version + docker compose version - run: name: Download st2-packages repository command: |