Skip to content

Commit afedd35

Browse files
authored
Merge pull request #6153 from StackStorm/add_rocky9
Build EL9 packages
2 parents 3c9655c + 01ae8ae commit afedd35

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

.circleci/config.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
# 'machine' executor runs Unit tests ~x1.5 faster, comparing to 'docker' executor
99
# but the fastest is still ~x1.5-2 slower, comparing to Travis
1010
machine: true
11-
parallelism: 2
11+
parallelism: 3
1212
working_directory: ~/st2
1313
steps:
1414
- checkout
@@ -107,33 +107,48 @@ jobs:
107107

108108
# Build & Test st2 packages
109109
packages:
110-
parallelism: 2
110+
parallelism: 3
111111
# 4CPUs & 8GB RAM CircleCI machine
112112
# sadly, it doesn't work with 'setup_remote_docker'
113113
resource_class: large
114114
docker:
115115
# The primary container is an instance of the first list image listed. Your build commands run in this container.
116-
- image: circleci/python:3.6
116+
- image: circleci/python:3.8
117117
working_directory: ~/st2
118118
environment:
119-
- DISTROS: "focal el8"
119+
- DISTROS: "focal el8 el9"
120120
- ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages
121121
- ST2_PACKAGES: "st2"
122122
- ST2_CHECKOUT: 0
123123
- ST2_GITDIR: /tmp/st2
124124
- BASH_ENV: ~/.buildenv
125125
steps:
126126
- checkout
127+
- run:
128+
name: Install latest Docker Compose V2
129+
command: |
130+
set -x
131+
export CODENAME=$(source /etc/os-release && echo "$VERSION_CODENAME")
132+
export DISTRO=$(source /etc/os-release && echo "$ID")
133+
export ARCH=$(dpkg --print-architecture)
134+
# get gpg key for download.docker
135+
curl -fsSL https://download.docker.com/linux/${DISTRO}/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/download.docker.gpg
136+
# set source list
137+
sudo tee <<<"deb [arch=${ARCH}] https://download.docker.com/linux/${DISTRO} ${CODENAME} stable" /etc/apt/sources.list.d/download.docker.list
138+
# update package list
139+
sudo apt update
140+
# install docker CLI and Docker Compose v2
141+
sudo apt install docker-ce-cli docker-compose-plugin
127142
- setup_remote_docker:
128143
reusable: true # default - false
129144
exclusive: true # default - true
130-
version: 19.03.14
145+
version: docker24
131146
- run:
132147
name: Docker version
133148
command: |
134149
set -x
135150
docker --version
136-
docker-compose --version
151+
docker compose version
137152
- run:
138153
name: Download st2-packages repository
139154
command: |
@@ -222,7 +237,7 @@ jobs:
222237
- image: circleci/ruby:2.7
223238
working_directory: /tmp/deploy
224239
environment:
225-
- DISTROS: "focal el8"
240+
- DISTROS: "focal el8 el9"
226241
steps:
227242
- attach_workspace:
228243
at: .

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ Added
2121
to pants' use of PEX lockfiles. This is not a user-facing addition.
2222
#6118 #6141 #6133
2323
Contributed by @cognifloyd
24+
* Build of ST2 EL9 packages #6153
25+
Contributed by @amanda11
2426

2527
3.8.1 - December 13, 2023
2628
-------------------------

0 commit comments

Comments
 (0)