Skip to content

Commit b9057c0

Browse files
committed
Revert "ci: Add 5-day grace period"
This reverts commit 66cd876. Signed-off-by: Cagri Yonca <cagri@ibm.com>
1 parent 66cd876 commit b9057c0

2 files changed

Lines changed: 18 additions & 224 deletions

File tree

.circleci/config.yml

Lines changed: 18 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ commands:
4646
command: |
4747
. venv/bin/activate
4848
pip install -r <<parameters.requirements>>
49-
- run:
50-
name: Apply grace period to installed packages
51-
command: |
52-
. venv/bin/activate
53-
pip install --quiet requests packaging
54-
python .circleci/pin_safe_versions.py <<parameters.requirements>>
5549
5650
run-tests-with-coverage-report:
5751
parameters:
@@ -87,22 +81,6 @@ commands:
8781
paths:
8882
- coverage_results
8983

90-
capture-installed-versions:
91-
parameters:
92-
label:
93-
type: string
94-
steps:
95-
- run:
96-
name: Capture installed package versions
97-
when: on_success
98-
command: |
99-
. venv/bin/activate
100-
pip freeze > /tmp/installed_<<parameters.label>>.txt
101-
- persist_to_workspace:
102-
root: /tmp
103-
paths:
104-
- installed_<<parameters.label>>.txt
105-
10684
store-pytest-results:
10785
steps:
10886
- store_test_results:
@@ -180,65 +158,57 @@ jobs:
180158
- pip-install-deps
181159
- pip-install-tests-deps
182160
- run-tests-with-coverage-report
183-
- capture-installed-versions:
184-
label: "py<<parameters.py-version>>"
185161
- store-pytest-results
186162
- store-coverage-report
187163

188-
py39gevent:
164+
py39cassandra:
189165
docker:
190166
- image: public.ecr.aws/docker/library/python:3.9
167+
- image: public.ecr.aws/docker/library/cassandra:3.11.16-jammy
168+
environment:
169+
MAX_HEAP_SIZE: 2048m
170+
HEAP_NEWSIZE: 512m
191171
working_directory: ~/repo
192172
steps:
193173
- checkout
194174
- check-if-tests-needed
195175
- pip-install-deps
196176
- pip-install-tests-deps:
197-
requirements: "tests/requirements-gevent-starlette.txt"
177+
requirements: "tests/requirements-cassandra.txt"
198178
- run-tests-with-coverage-report:
199-
gevent: "true"
200-
tests: "tests/frameworks/test_gevent.py"
201-
- capture-installed-versions:
202-
label: "gevent"
179+
cassandra: "true"
180+
tests: "tests/clients/test_cassandra-driver.py"
203181
- store-pytest-results
204182
- store-coverage-report
205183

206-
py312aws:
184+
py39gevent:
207185
docker:
208-
- image: public.ecr.aws/docker/library/python:3.12
186+
- image: public.ecr.aws/docker/library/python:3.9
209187
working_directory: ~/repo
210188
steps:
211189
- checkout
212190
- check-if-tests-needed
213191
- pip-install-deps
214192
- pip-install-tests-deps:
215-
requirements: "tests/requirements-aws.txt"
193+
requirements: "tests/requirements-gevent-starlette.txt"
216194
- run-tests-with-coverage-report:
217-
tests: "tests_aws"
218-
- capture-installed-versions:
219-
label: "aws"
195+
gevent: "true"
196+
tests: "tests/frameworks/test_gevent.py"
220197
- store-pytest-results
221198
- store-coverage-report
222199

223-
py312cassandra:
200+
py312aws:
224201
docker:
225202
- image: public.ecr.aws/docker/library/python:3.12
226-
- image: public.ecr.aws/docker/library/cassandra:3.11.16-jammy
227-
environment:
228-
MAX_HEAP_SIZE: 2048m
229-
HEAP_NEWSIZE: 512m
230203
working_directory: ~/repo
231204
steps:
232205
- checkout
233206
- check-if-tests-needed
234207
- pip-install-deps
235208
- pip-install-tests-deps:
236-
requirements: "tests/requirements-cassandra.txt"
209+
requirements: "tests/requirements-aws.txt"
237210
- run-tests-with-coverage-report:
238-
cassandra: "true"
239-
tests: "tests/clients/test_cassandra-driver.py"
240-
- capture-installed-versions:
241-
label: "cassandra"
211+
tests: "tests_aws"
242212
- store-pytest-results
243213
- store-coverage-report
244214

@@ -283,8 +253,6 @@ jobs:
283253
- run-tests-with-coverage-report:
284254
kafka: "true"
285255
tests: "tests/clients/kafka/test*.py"
286-
- capture-installed-versions:
287-
label: "kafka"
288256
- store-pytest-results
289257
- store-coverage-report
290258

@@ -317,22 +285,6 @@ jobs:
317285
- check-if-tests-needed
318286
- run_sonarqube
319287

320-
update-currency-versions:
321-
docker:
322-
- image: public.ecr.aws/docker/library/alpine:latest
323-
steps:
324-
- attach_workspace:
325-
at: /tmp/workspace
326-
- run:
327-
name: Collect pip freeze files
328-
command: |
329-
mkdir -p /tmp/pip-freeze
330-
cp /tmp/workspace/installed_*.txt /tmp/pip-freeze/
331-
ls -la /tmp/pip-freeze/
332-
- store_artifacts:
333-
path: /tmp/pip-freeze
334-
destination: pip-freeze
335-
336288
workflows:
337289
tests:
338290
max_auto_reruns: 2
@@ -341,9 +293,9 @@ workflows:
341293
matrix:
342294
parameters:
343295
py-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
296+
- py39cassandra
344297
- py39gevent
345298
- py312aws
346-
- py312cassandra
347299
- py313kafka
348300
- autowrapt:
349301
matrix:
@@ -352,20 +304,8 @@ workflows:
352304
- final_job:
353305
requires:
354306
- python3x
307+
- py39cassandra
355308
- py39gevent
356309
- py312aws
357-
- py312cassandra
358310
- py313kafka
359311
- autowrapt
360-
- update-currency-versions:
361-
filters:
362-
branches:
363-
only:
364-
- main
365-
requires:
366-
- python3x
367-
- py39gevent
368-
- py312aws
369-
- py312cassandra
370-
- py313kafka
371-
- final_job

.circleci/pin_safe_versions.py

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)