From cf7f24b3d3f3d0930fd4b4bd7e37e2457dd84639 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Thu, 24 Jun 2021 11:11:21 -0600 Subject: [PATCH] Bump api/sdk versions in acceptance tests (#1002) --- .circleci/config.yml | 27 ++++++++++++++++++--------- test/acceptance/go.mod | 4 ++-- test/acceptance/go.sum | 4 ++++ test/docker/Test.dockerfile | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 685f954be1bc..00b5a0d2ebda 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ orbs: executors: go: docker: - - image: docker.mirror.hashicorp.services/circleci/golang:1.14 + - image: docker.mirror.hashicorp.services/circleci/golang:1.16 environment: - TEST_RESULTS: /tmp/test-results @@ -14,7 +14,14 @@ commands: - run: name: Install gotestsum, kind, kubectl, and helm command: | - go get gotest.tools/gotestsum + wget https://golang.org/dl/go1.16.5.linux-amd64.tar.gz + sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz + rm go1.16.5.linux-amd64.tar.gz + echo 'export PATH=$PATH:/usr/local/go/bin' >> $BASH_ENV + + wget https://github.com/gotestyourself/gotestsum/releases/download/v1.6.4/gotestsum_1.6.4_linux_amd64.tar.gz + sudo tar -C /usr/local/bin -xzf gotestsum_1.6.4_linux_amd64.tar.gz + rm gotestsum_1.6.4_linux_amd64.tar.gz curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.0/kind-linux-amd64 chmod +x ./kind @@ -101,7 +108,7 @@ commands: jobs: unit-helm: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.1 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - checkout @@ -134,6 +141,7 @@ jobs: # check go fmt output because it does not report non-zero when there are fmt changes - run: name: check go fmt + working_directory: test/acceptance command: | files=$(go fmt ./...) if [ -n "$files" ]; then @@ -239,7 +247,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - run: @@ -305,7 +313,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - checkout @@ -360,7 +368,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - checkout @@ -427,7 +435,7 @@ jobs: parallelism: 3 docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - checkout @@ -530,6 +538,7 @@ jobs: # check go fmt output because it does not report non-zero when there are fmt changes - run: name: check go fmt + working_directory: hack/helm-reference-gen command: | files=$(go fmt ./...) if [ -n "$files" ]; then @@ -614,7 +623,7 @@ jobs: cleanup-azure-resources: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - run: name: cleanup leftover resources @@ -628,7 +637,7 @@ jobs: cleanup-gcp-resources: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.9.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.10.0 steps: - run: name: cleanup leftover resources diff --git a/test/acceptance/go.mod b/test/acceptance/go.mod index 490cc4689db8..aa8c7a334dcd 100644 --- a/test/acceptance/go.mod +++ b/test/acceptance/go.mod @@ -4,8 +4,8 @@ go 1.14 require ( github.com/gruntwork-io/terratest v0.31.2 - github.com/hashicorp/consul/api v1.4.1-0.20210614201509-ffb13f35f1ad - github.com/hashicorp/consul/sdk v0.7.0 + github.com/hashicorp/consul/api v1.9.0 + github.com/hashicorp/consul/sdk v0.8.0 github.com/stretchr/testify v1.5.1 gopkg.in/yaml.v2 v2.2.8 k8s.io/api v0.19.3 diff --git a/test/acceptance/go.sum b/test/acceptance/go.sum index 45d2d53ddda5..e984936a7df2 100644 --- a/test/acceptance/go.sum +++ b/test/acceptance/go.sum @@ -227,8 +227,12 @@ github.com/gruntwork-io/terratest v0.31.2 h1:xvYHA80MUq5kx670dM18HInewOrrQrAN+Xb github.com/gruntwork-io/terratest v0.31.2/go.mod h1:EEgJie28gX/4AD71IFqgMj6e99KP5mi81hEtzmDjxTo= github.com/hashicorp/consul/api v1.4.1-0.20210614201509-ffb13f35f1ad h1:nynVR0qTR2vUCY8j0PqwcyjhlkwcLov/mnNiDQoBRjw= github.com/hashicorp/consul/api v1.4.1-0.20210614201509-ffb13f35f1ad/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= +github.com/hashicorp/consul/api v1.9.0 h1:T6dKIWcaihG2c21YUi0BMAHbJanVXiYuz+mPgqxY3N4= +github.com/hashicorp/consul/api v1.9.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/sdk v0.7.0 h1:H6R9d008jDcHPQPAqPNuydAshJ4v5/8URdFnUvK/+sc= github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= +github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= diff --git a/test/docker/Test.dockerfile b/test/docker/Test.dockerfile index 485938891404..48f0605024de 100644 --- a/test/docker/Test.dockerfile +++ b/test/docker/Test.dockerfile @@ -6,7 +6,7 @@ # a script to configure kubectl, potentially install Helm, and run the tests # manually. This image only has the dependencies pre-installed. -FROM circleci/golang:1.14 +FROM circleci/golang:1.16 # change the user to root so we can install stuff USER root