diff --git a/.circleci/config.yml b/.circleci/config.yml index 784eaf13..15ea53d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,6 +42,16 @@ commands: jobs: tests-python-3: machine: true + parameters: + influxdb-repository: + type: string + default: "influxdb" + influxdb-version: + type: string + default: "2.0.0-beta" + environment: + INFLUXDB_V2_REPOSITORY: << parameters.influxdb-repository >> + INFLUXDB_V2_VERSION: << parameters.influxdb-version >> steps: - prepare - client-test: @@ -56,7 +66,12 @@ workflows: version: 2 build: jobs: - - tests-python-3 + - tests-python-3: + name: test-beta + - tests-python-3: + name: test-nightly + influxdb-repository: "influx" + influxdb-version: "nightly" nightly: triggers: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f4159d78..00000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: python -python: - - "3.6" -# command to install dependencies -install: - - pip install -r requirements.txt - - pip install -r extra-requirements.txt - - pip install -r test-requirements.txt -# command to run tests -script: - - ./scripts/influxdb-restart.sh - - pytest tests \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d4e1a0f..0f861050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ ### API 1. [#47](https://github.com/influxdata/influxdb-client-python/pull/47): Updated swagger to latest version +### CI +1. [#49](https://github.com/influxdata/influxdb-client-python/pull/49): Added beta release to continuous integration + ### Bugs 1. [#48](https://github.com/influxdata/influxdb-client-python/pull/48): InfluxDBClient default org is used by WriteAPI diff --git a/scripts/influxdb-restart.sh b/scripts/influxdb-restart.sh index 9602f3cb..3f6aa4b4 100755 --- a/scripts/influxdb-restart.sh +++ b/scripts/influxdb-restart.sh @@ -26,9 +26,11 @@ set -e DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/" DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}" -DEFAULT_INFLUXDB_V2_VERSION="nightly" +DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb" +DEFAULT_INFLUXDB_V2_VERSION="2.0.0-beta" +INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}" INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}" -INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}influx:${INFLUXDB_V2_VERSION} +INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION} SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"