chore: build also over beta version (influxdata#11)

kelseiv · Jan 9, 2020 · 1fce078 · 1fce078
1 parent bd2ff6c
commit 1fce078
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,9 +76,18 @@ jobs:
       ruby-image:
         type: string
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
+      influxdb-repository:
+        type: string
+        default: "influxdb"
+      influxdb-version:
+        type: string
+        default: "2.0.0-beta"
     docker:
       - image: << parameters.ruby-image >>
       - image: &influx-image quay.io/influxdb/influx:nightly
+    environment:
+      INFLUXDB_V2_REPOSITORY: << parameters.influxdb-repository >>
+      INFLUXDB_V2_VERSION: << parameters.influxdb-version >>
     steps:
       - prepare
       - test:
@@ -118,6 +127,10 @@ workflows:
           ruby-image: "circleci/ruby:2.7-buster"
       - tests-ruby:
           name: ruby-2.6
+      - tests-ruby:
+          name: ruby-2.6-nightly
+          influxdb-repository: "influx"
+          influxdb-version: "nightly"
       - tests-ruby:
           name: ruby-2.5
           ruby-image: "circleci/ruby:2.5-stretch"
@@ -128,6 +141,7 @@ workflows:
           requires:
             - ruby-2.7
             - ruby-2.6
+            - ruby-2.6-nightly
             - ruby-2.5
             - ruby-2.4
           filters:

diff --git a/bin/influxdb-restart.sh b/bin/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 )"