Skip to content

Upgrade test target image#17226

Merged
huikang merged 2 commits intomainfrom
upgrade-test-targetImage
May 8, 2023
Merged

Upgrade test target image#17226
huikang merged 2 commits intomainfrom
upgrade-test-targetImage

Conversation

@huikang
Copy link
Collaborator

@huikang huikang commented May 5, 2023

Description

Split from #17186

Change to upgrade test

  • pass target image name to cluster.StandardUpgrade(utils.GetTargetImageName(), tc.targetVersion), because the image we upgrade to is consul:locally, which is built locally in the CI runner. This image name may be different from the latest image docker.mirror.hashicorp.services/docker:1.15 for example.
  • fix a bug in test/integration/consul-container/test/upgrade/fullstopupgrade_test.go that always true when an error is expected. (the second commit in the PR)

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

@huikang huikang requested a review from a team May 5, 2023 14:12
@huikang huikang added backport/1.15 This release series is no longer active on CE. Use backport/ent/1.15. pr/no-changelog PR does not need a corresponding .changelog entry labels May 5, 2023
@huikang huikang force-pushed the upgrade-test-targetImage branch from 43a0088 to 77f866d Compare May 5, 2023 14:45
huikang added 2 commits May 8, 2023 10:34
- the image name of latest version and target version could be
  different. Add the parameter of targetImage to the upgrade
  function
Copy link
Contributor

@loshz loshz left a comment

Choose a reason for hiding this comment

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

LGTM - I added 1.13/1.14 backport labels, but feel free to remove them if this change will only affect 1.15 and above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.15 This release series is no longer active on CE. Use backport/ent/1.15. pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants