-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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.
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
upgrade test: use docker.mirror.hashicorp.services to avoid docker login #17186
Conversation
bbc2b3a
to
6fa3fd6
Compare
@@ -324,7 +324,7 @@ jobs: | |||
${{ matrix.test-cases }} \ | |||
--target-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \ | |||
--target-version local \ | |||
--latest-image ${{ env.CONSUL_LATEST_IMAGE_NAME }} \ | |||
--latest-image docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }} \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@loshz , this is where we change the docker image to use docker.mirror.hashicorp.services
. I am not sure where to remove the docker login
since it seems needed to pull vault image. Please advise.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I pushed a change in 81e3c44
696fecd
to
3390837
Compare
If we’re removing the Dockerhub login, then we need to pull images from the HCP registry instead as we could be hit by quota limits if we have a lot of CI jobs running. |
3390837
to
377ca68
Compare
The Docker changes LGTM, but I'm unsure if we need to add the image parameter in this PR? I'd like this to be as atomic as possible, so could we do that in a separate PR once we can validate the removal of Docker Hub in GHA works as expected? |
@loshz , are you referring to the changes in other files for upgrade test? If so, these changes are necessary since the latest image and target image name will be different:
consul/test/integration/consul-container/libs/cluster/agent.go Lines 73 to 75 in 90fc9bd
So I think these changes are needed for make CI passed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@huikang ah, I see! This LGTM - thanks for fixing the issue.
Ok, sounds good! So we're going to merge #17226 first and then this one? |
Signed-off-by: Dan Bond <[email protected]>
377ca68
to
b86c1eb
Compare
Description
Use docker image from
docker.mirror.hashicorp.services
to avoid docker login in GHAAlso add image name as parameter to
cluster.StandardUpgrade(utils.GetTargetImageName(), tc.targetVersion)
, because the image we upgrade to isconsul:locally
, which is different than the latest imagedocker.mirror.hashicorp.services/docker:1.15
for example.PR Checklist