diff --git a/.circleci/config.yml b/.circleci/config.yml index 7de3a4f3..f3730b6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,7 @@ jobs: default: &default-ruby-image "circleci/ruby:2.6-stretch" influxdb-image: type: string - default: &default-influxdb-image "influxdb:v2.0.2" + default: &default-influxdb-image "influxdb:v2.0.3" docker: - image: << parameters.ruby-image >> - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >> @@ -124,7 +124,7 @@ workflows: name: ruby-2.6 - tests-ruby: name: ruby-2.6-nightly - influxdb-image: "influx:nightly" + influxdb-image: "influxdb2:nightly" - tests-ruby: name: ruby-2.5 ruby-image: "circleci/ruby:2.5-stretch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0048452a..4a16e1af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## 1.11.0 [unreleased] +### CI +1. [#63](https://github.com/influxdata/influxdb-client-ruby/pull/63): Updated default docker image to v2.0.3 + ## 1.10.0 [2020-12-04] ### Features diff --git a/bin/influxdb-restart.sh b/bin/influxdb-restart.sh index bb68bcf1..6af233a6 100755 --- a/bin/influxdb-restart.sh +++ b/bin/influxdb-restart.sh @@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/" DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}" DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb" -DEFAULT_INFLUXDB_V2_VERSION="v2.0.2" +DEFAULT_INFLUXDB_V2_VERSION="v2.0.3" 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}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION} diff --git a/test/influxdb/delete_api_integration_test.rb b/test/influxdb/delete_api_integration_test.rb index 2d3d60d7..8ede9f43 100644 --- a/test/influxdb/delete_api_integration_test.rb +++ b/test/influxdb/delete_api_integration_test.rb @@ -56,8 +56,6 @@ def setup end def test_delete - # TODO: https://github.com/influxdata/influxdb/issues/19545 - skip @client.create_delete_api.delete(Time.utc(2015, 10, 16, 8, 20, 15), Time.utc(2020, 10, 16, 8, 20, 15), predicate: 'location="europe"') @@ -65,24 +63,18 @@ def test_delete end def test_delete_without_predicate - # TODO: https://github.com/influxdata/influxdb/issues/19545 - skip @client.create_delete_api.delete(Time.utc(2016, 10, 15, 7, 20, 15), Time.utc(2018, 10, 14, 8, 20, 15)) assert_equal 2, _query_count end def test_delete_all - # TODO: https://github.com/influxdata/influxdb/issues/19545 - skip @client.create_delete_api.delete(Time.utc(2010, 10, 15, 7, 20, 15), Time.utc(2020, 10, 14, 8, 20, 15)) assert_equal 0, _query_count end def test_delete_without_interval - # TODO: https://github.com/influxdata/influxdb/issues/19545 - skip error = assert_raises InfluxDB2::InfluxError do @client.create_delete_api.delete(nil, nil) end