Skip to content

Commit 40c8ced

Browse files
authored
feat(ci): Migrate away from legacy circleci convenience images (#357)
https://discuss.circleci.com/t/legacy-convenience-image-deprecation/41034
1 parent 4aa6152 commit 40c8ced

File tree

1 file changed

+64
-34
lines changed

1 file changed

+64
-34
lines changed

.circleci/config.yml

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commands:
1616
command: |
1717
rm -rf venv
1818
export PATH=/home/circleci/.local/bin:$PATH
19-
pip install --user -U pip setuptools virtualenv wheel
19+
pip install -U pip setuptools virtualenv wheel
2020
virtualenv --python=python2.7 --always-copy venv
2121
. venv/bin/activate
2222
pip install 'wheel>=0.29.0'
@@ -31,9 +31,12 @@ commands:
3131
steps:
3232
- run:
3333
name: Install Python Dependencies
34+
# TODO: Remove the pinning of setuptools
35+
# as soon as we get rid of suds-jurko
3436
command: |
3537
python -m venv venv
3638
. venv/bin/activate
39+
pip install --upgrade 'setuptools<58'
3740
pip install --upgrade pip
3841
pip install 'wheel>=0.29.0'
3942
pip install -r requirements.txt
@@ -54,19 +57,28 @@ commands:
5457
jobs:
5558
python27:
5659
docker:
57-
- image: circleci/python:2.7.16-stretch
58-
- image: circleci/postgres:9.6.5-alpine-ram
59-
- image: circleci/mariadb:10.1-ram
60-
- image: circleci/redis:5.0.4
60+
- image: cimg/python:2.7.18
61+
- image: cimg/postgres:9.6.24
62+
environment:
63+
POSTGRES_USER: root
64+
POSTGRES_PASSWORD: ''
65+
POSTGRES_DB: circle_test
66+
- image: cimg/mariadb:10.6.7
67+
- image: cimg/redis:5.0.14
6168
- image: rabbitmq:3.5.4
62-
- image: circleci/mongo:4.2.3-ram
69+
- image: mongo:4.2.3
6370
- image: singularities/pubsub-emulator
6471
environment:
6572
PUBSUB_PROJECT_ID: "project-test"
6673
PUBSUB_LISTEN_ADDRESS: "0.0.0.0:8432"
6774
working_directory: ~/repo
6875
steps:
6976
- checkout
77+
- run:
78+
name: Install MySQL Dependencies
79+
command: |
80+
sudo apt update
81+
sudo apt install libmysqlclient-dev
7082
- pip-install-deps-27
7183
- run:
7284
name: run tests
@@ -78,12 +90,16 @@ jobs:
7890
7991
python37:
8092
docker:
81-
- image: circleci/python:3.7.9
82-
- image: circleci/postgres:9.6.5-alpine-ram
83-
- image: circleci/mariadb:10-ram
84-
- image: circleci/redis:5.0.4
93+
- image: cimg/python:3.7.12
94+
- image: cimg/postgres:9.6.24
95+
environment:
96+
POSTGRES_USER: root
97+
POSTGRES_PASSWORD: ''
98+
POSTGRES_DB: circle_test
99+
- image: cimg/mariadb:10.6.7
100+
- image: cimg/redis:5.0.14
85101
- image: rabbitmq:3.5.4
86-
- image: circleci/mongo:4.2.3-ram
102+
- image: mongo:4.2.3
87103
- image: singularities/pubsub-emulator
88104
environment:
89105
PUBSUB_PROJECT_ID: "project-test"
@@ -104,12 +120,16 @@ jobs:
104120
105121
python38:
106122
docker:
107-
- image: circleci/python:3.8.6
108-
- image: circleci/postgres:9.6.5-alpine-ram
109-
- image: circleci/mariadb:10-ram
110-
- image: circleci/redis:5.0.4
123+
- image: cimg/python:3.8.12
124+
- image: cimg/postgres:9.6.24
125+
environment:
126+
POSTGRES_USER: root
127+
POSTGRES_PASSWORD: ''
128+
POSTGRES_DB: circle_test
129+
- image: cimg/mariadb:10.6.7
130+
- image: cimg/redis:5.0.14
111131
- image: rabbitmq:3.5.4
112-
- image: circleci/mongo:4.2.3-ram
132+
- image: mongo:4.2.3
113133
- image: singularities/pubsub-emulator
114134
environment:
115135
PUBSUB_PROJECT_ID: "project-test"
@@ -132,12 +152,16 @@ jobs:
132152

133153
python39:
134154
docker:
135-
- image: circleci/python:3.9.0-buster
136-
- image: circleci/postgres:9.6.5-alpine-ram
137-
- image: circleci/mariadb:10-ram
138-
- image: circleci/redis:5.0.4
155+
- image: cimg/python:3.9.10
156+
- image: cimg/postgres:9.6.24
157+
environment:
158+
POSTGRES_USER: root
159+
POSTGRES_PASSWORD: ''
160+
POSTGRES_DB: circle_test
161+
- image: cimg/mariadb:10.6.7
162+
- image: cimg/redis:5.0.14
139163
- image: rabbitmq:3.5.4
140-
- image: circleci/mongo:4.2.3-ram
164+
- image: mongo:4.2.3
141165
- image: singularities/pubsub-emulator
142166
environment:
143167
PUBSUB_PROJECT_ID: "project-test"
@@ -156,12 +180,16 @@ jobs:
156180
157181
python310:
158182
docker:
159-
- image: circleci/python:3.10.0-buster
160-
- image: circleci/postgres:9.6.5-alpine-ram
161-
- image: circleci/mariadb:10-ram
162-
- image: circleci/redis:5.0.4
183+
- image: cimg/python:3.10.2
184+
- image: cimg/postgres:9.6.24
185+
environment:
186+
POSTGRES_USER: root
187+
POSTGRES_PASSWORD: ''
188+
POSTGRES_DB: circle_test
189+
- image: cimg/mariadb:10.6.7
190+
- image: cimg/redis:5.0.14
163191
- image: rabbitmq:3.5.4
164-
- image: circleci/mongo:4.2.3-ram
192+
- image: mongo:4.2.3
165193
- image: singularities/pubsub-emulator
166194
environment:
167195
PUBSUB_PROJECT_ID: "project-test"
@@ -181,7 +209,7 @@ jobs:
181209
182210
py38couchbase:
183211
docker:
184-
- image: circleci/python:3.7.8-stretch
212+
- image: cimg/python:3.8.12
185213
- image: couchbase/server-sandbox:5.5.0
186214
working_directory: ~/repo
187215
steps:
@@ -200,7 +228,7 @@ jobs:
200228
201229
py27couchbase:
202230
docker:
203-
- image: circleci/python:2.7.16-stretch
231+
- image: cimg/python:2.7.18
204232
- image: couchbase/server-sandbox:5.5.0
205233
working_directory: ~/repo
206234
steps:
@@ -219,8 +247,8 @@ jobs:
219247
220248
py27cassandra:
221249
docker:
222-
- image: circleci/python:2.7.16-stretch
223-
- image: circleci/cassandra:3.10
250+
- image: cimg/python:2.7.16
251+
- image: cassandra:3.11
224252
environment:
225253
MAX_HEAP_SIZE: 2048m
226254
HEAP_NEWSIZE: 512m
@@ -241,8 +269,8 @@ jobs:
241269
242270
py36cassandra:
243271
docker:
244-
- image: circleci/python:3.6.11
245-
- image: circleci/cassandra:3.10
272+
- image: cimg/python:3.6.11
273+
- image: cassandra:3.11
246274
environment:
247275
MAX_HEAP_SIZE: 2048m
248276
HEAP_NEWSIZE: 512m
@@ -263,6 +291,8 @@ jobs:
263291
py37asynqp:
264292
docker:
265293
- image: circleci/python:3.7.9
294+
# TODO: Figure out why this causes 'AssertionError: 6 != 8'
295+
# - image: cimg/python:3.7.12
266296
- image: rabbitmq:3.5.4
267297
working_directory: ~/repo
268298
steps:
@@ -282,7 +312,7 @@ jobs:
282312
283313
py37asynqp-legacy:
284314
docker:
285-
- image: circleci/python:3.7.9
315+
- image: cimg/python:3.7.12
286316
- image: rabbitmq:3.5.4
287317
working_directory: ~/repo
288318
steps:
@@ -302,7 +332,7 @@ jobs:
302332
303333
gevent38:
304334
docker:
305-
- image: circleci/python:3.8.5
335+
- image: cimg/python:3.8.5
306336
working_directory: ~/repo
307337
steps:
308338
- checkout

0 commit comments

Comments
 (0)