Skip to content

Commit 2acedaa

Browse files
committed
chore: add tests job without ciso8601
1 parent 9b05758 commit 2acedaa

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.circleci/config.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ commands:
1616
parameters:
1717
python-image:
1818
type: string
19+
enabled-ciso-8601:
20+
type: boolean
1921
steps:
2022
- restore_cache:
2123
name: Restoring Pip Cache
2224
keys:
23-
- &cache-key pip-cache-v9-<< parameters.python-image >>-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "extra-requirements.txt" }}
24-
- pip-cache-v9-<< parameters.python-image >>-
25+
- &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "requirements.txt" }}-{{ checksum "test-requirements.txt" }}-{{ checksum "extra-requirements.txt" }}-{{ checksum "ciso-requirements.txt" }}
26+
- pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-
2527
- run:
2628
command: | # use pipenv to install dependencies
2729
sudo pip install pipenv
@@ -48,19 +50,20 @@ jobs:
4850
influxdb-image:
4951
type: string
5052
default: "influxdb:2.0.0-beta"
51-
disable-ciso-8601:
53+
enabled-ciso-8601:
5254
type: boolean
53-
default: false
55+
default: true
5456
docker:
5557
- image: << parameters.python-image >>
5658
environment: # environment variables for primary container
5759
PIPENV_VENV_IN_PROJECT: true
58-
DISABLE_CISO_8601: << parameters.disable-ciso-8601 >>
60+
ENABLED_CISO_8601: << parameters.enabled-ciso-8601 >>
5961
- image: quay.io/influxdb/<< parameters.influxdb-image >>
6062
steps:
6163
- prepare
6264
- client-test:
6365
python-image: << parameters.python-image >>
66+
enabled-ciso-8601: << parameters.enabled-ciso-8601 >>
6467
- store_test_results:
6568
path: test-reports
6669
- run:
@@ -75,7 +78,7 @@ workflows:
7578
name: python-3.6
7679
- tests-python:
7780
name: python-3.6-without-ciso8601
78-
disable-ciso-8601: true
81+
enabled-ciso-8601: false
7982
- tests-python:
8083
name: python-3.6-nightly
8184
influxdb-image: "influx:nightly"

scripts/ci-test.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
set -e
44

5+
ENABLED_CISO_8601="${ENABLED_CISO_8601:-true}"
6+
57
#
68
# Install requirements
79
#
810
python --version
911
pip install -r requirements.txt --user
1012
pip install -r extra-requirements.txt --user
1113
pip install -r test-requirements.txt --user
12-
if [ "$DISABLE_CISO_8601" = true ] ; then
13-
echo "ciso8601 is disabled"
14+
if [ "$ENABLED_CISO_8601" = true ] ; then
15+
echo "ciso8601 is enabled"
1416
pip install -r ciso-requirements.txt --user
1517
fi
1618
pip install pytest pytest-cov --user

0 commit comments

Comments
 (0)