From 761fdacda6b8e5cf5a843b13b8664b2b7c3653cf Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Tue, 18 Jul 2023 12:04:11 -0500 Subject: [PATCH] Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.16.x (#18148) Co-authored-by: Nick Irvine <115657443+nfi-hashicorp@users.noreply.github.com> --- .github/workflows/test-integrations.yml | 5 +++-- test/integration/consul-container/libs/utils/version.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index ba8f5b19a..fa68f3607 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -22,7 +22,8 @@ env: GOTESTSUM_VERSION: "1.10.1" CONSUL_BINARY_UPLOAD_NAME: consul-bin # strip the hashicorp/ off the front of github.repository for consul - CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'consul' }} + CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: @@ -474,7 +475,7 @@ jobs: strategy: fail-fast: false matrix: - consul-version: [ "1.14", "1.15"] + consul-version: ["1.14", "1.15", "1.16"] env: CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} ENVOY_VERSION: "1.24.6" diff --git a/test/integration/consul-container/libs/utils/version.go b/test/integration/consul-container/libs/utils/version.go index 394cae35b..91c4da5e3 100644 --- a/test/integration/consul-container/libs/utils/version.go +++ b/test/integration/consul-container/libs/utils/version.go @@ -24,7 +24,7 @@ var ( ) const ( - DefaultImageNameOSS = "consul" + DefaultImageNameOSS = "hashicorp/consul" DefaultImageNameENT = "hashicorp/consul-enterprise" ImageVersionSuffixENT = "-ent" )