From dbcc5613eac28d5674aa0e9153538f45d925dda5 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 9 Jan 2020 12:56:32 +0100 Subject: [PATCH 1/4] chore: build also over beta version --- .circleci/config.yml | 17 ++++++++++++++++- CHANGELOG.md | 3 +++ scripts/influxdb-restart.sh | 6 ++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 784eaf13..a4cb40b9 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/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 )" From dbda3667f35c818046f5b34b8bc79d534a36d529 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 9 Jan 2020 12:57:28 +0100 Subject: [PATCH 2/4] chore: build also over beta version --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 .travis.yml 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 From cfeb738f4733afbbda76db6b86af3aa15169d023 Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 9 Jan 2020 13:03:27 +0100 Subject: [PATCH 3/4] chore: build also over beta version --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4cb40b9..c00b9612 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,6 @@ workflows: name: test-nightly influxdb-repository: "influx" influxdb-version: "nightly" - nightly: triggers: - schedule: From b6d992203132ec5d48395eebe7e5c5d0963a173e Mon Sep 17 00:00:00 2001 From: Jakub Bednar Date: Thu, 9 Jan 2020 13:05:07 +0100 Subject: [PATCH 4/4] chore: build also over beta version --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c00b9612..15ea53d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,9 +49,9 @@ jobs: influxdb-version: type: string default: "2.0.0-beta" - environment: - INFLUXDB_V2_REPOSITORY: << parameters.influxdb-repository >> - INFLUXDB_V2_VERSION: << parameters.influxdb-version >> + environment: + INFLUXDB_V2_REPOSITORY: << parameters.influxdb-repository >> + INFLUXDB_V2_VERSION: << parameters.influxdb-version >> steps: - prepare - client-test: @@ -72,6 +72,7 @@ workflows: name: test-nightly influxdb-repository: "influx" influxdb-version: "nightly" + nightly: triggers: - schedule: