From 7a10f95a221dec2d48a378eabfa184e1e26f4c9f Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Tue, 18 Jul 2023 12:03:41 -0500 Subject: [PATCH] Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.15.x (#18147) Co-authored-by: Nick Irvine <115657443+nfi-hashicorp@users.noreply.github.com> --- .github/workflows/test-integrations.yml | 3 ++- test/integration/consul-container/libs/utils/version.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index db45145bd5..4f0717054f 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: ${{ github.repository }} + CONSUL_LATEST_IMAGE_NAME: ${{ endsWith(github.repository, '-enterprise') && github.repository || 'hashicorp/consul' }} + GOPRIVATE: github.com/hashicorp # Required for enterprise deps jobs: setup: diff --git a/test/integration/consul-container/libs/utils/version.go b/test/integration/consul-container/libs/utils/version.go index 4f188f7429..9f63622862 100644 --- a/test/integration/consul-container/libs/utils/version.go +++ b/test/integration/consul-container/libs/utils/version.go @@ -19,7 +19,7 @@ var ( ) const ( - DefaultImageNameOSS = "consul" + DefaultImageNameOSS = "hashicorp/consul" DefaultImageNameENT = "hashicorp/consul-enterprise" ImageVersionSuffixENT = "-ent" )