github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/18173/head
hc-github-team-consul-core 2023-07-18 12:04:11 -05:00 committed by GitHub
parent bd336b96cf
commit 8012e069ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/test-integrations.yml vendored
View File

@ -22,7 +22,8 @@ env:
GOTESTSUM_VERSION: "1.10.1" GOTESTSUM_VERSION: "1.10.1"
CONSUL_BINARY_UPLOAD_NAME: consul-bin CONSUL_BINARY_UPLOAD_NAME: consul-bin
# strip the hashicorp/ off the front of github.repository for consul # 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: jobs:
setup: setup:
@ -474,7 +475,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
consul-version: [ "1.14", "1.15"] consul-version: ["1.14", "1.15", "1.16"]
env: env:
CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
ENVOY_VERSION: "1.24.6" ENVOY_VERSION: "1.24.6"

2
test/integration/consul-container/libs/utils/version.go
View File

@ -24,7 +24,7 @@ var (
) )
const ( const (
DefaultImageNameOSS = "consul" DefaultImageNameOSS = "hashicorp/consul"
DefaultImageNameENT = "hashicorp/consul-enterprise" DefaultImageNameENT = "hashicorp/consul-enterprise"
ImageVersionSuffixENT = "-ent" ImageVersionSuffixENT = "-ent"
) )