From 91fcf90c4ab87450ef5f7112357c0a215f28e505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Serv=C3=A9n=20Mar=C3=ADn?= <lserven@gmail.com>
Date: Wed, 15 Apr 2020 13:24:28 +0200
Subject: [PATCH] .circleci: use consistent ci image tags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We were not using the latest thanos-ci image tag for every part of the
CI pipeline: we were using 0.3.0 for tests but 0.2.0 for all builds.

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
---
 .circleci/config.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5593d759a..ac2336fe09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,13 @@
 # NOTE: Current plan gives 1500 build minutes per month.
 version: 2
+# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
+defaults: &defaults
+  docker:
+    # Built by Thanos make docker-ci
+    - image: quay.io/thanos/thanos-ci:v0.3.0
 jobs:
   test:
-    docker:
-     # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.3.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GO111MODULE: 'on'
@@ -58,9 +61,7 @@ jobs:
         - .build
 
   publish_master:
-    docker:
-      # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.2.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     steps:
       - checkout
@@ -78,9 +79,7 @@ jobs:
       - run: make docker-push
 
   publish_release:
-    docker:
-      # Build by Thanos make docker-ci
-      - image: quay.io/thanos/thanos-ci:v0.2.0
+    <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
     environment:
       GOBIN: "/go/bin"