Skip to content

Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.15.x #18147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nfi-hashicorp merged 2 commits into from
Jul 18, 2023
Merged

Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.15.x #18147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dc86eb
chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] (#18130)
nfi-hashicorp Jul 14, 2023
d83bf54
Update .github/workflows/test-integrations.yml
nfi-hashicorp Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test-integrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -467,7 +468,7 @@ jobs:
strategy:
fail-fast: false
matrix:
consul-version: [ "1.14", "1.15"]
consul-version: [ "1.15", "1.16"]

@huikang huikang Jul 17, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should still be 1.14 and 1.15, since we test upgrading from previous minor versions and patch versions.

Comment thread
nfi-hashicorp marked this conversation as resolved.
Outdated
env:
CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
ENVOY_VERSION: "1.24.6"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/consul-container/libs/utils/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var (
)

const (
DefaultImageNameOSS = "consul"
DefaultImageNameOSS = "hashicorp/consul"
DefaultImageNameENT = "hashicorp/consul-enterprise"
ImageVersionSuffixENT = "-ent"
)
Expand Down