Skip to content

Don't resolve image by contacting registry for docker stack deploy tests#33386

Closed
nishanttotla wants to merge 1 commit intomoby:masterfrom
nishanttotla:no-registry-contact-stack-deploy
Closed

Don't resolve image by contacting registry for docker stack deploy tests#33386
nishanttotla wants to merge 1 commit intomoby:masterfrom
nishanttotla:no-registry-contact-stack-deploy

Conversation

@nishanttotla
Copy link
Contributor

@nishanttotla nishanttotla commented May 25, 2017

This PR turns off digest pinning for docker stack deploy integration-cli tests.

It should be merged as soon as the CLI changes of docker/cli#121 are merged and included.

We did a similar thing for docker service create and update in #33274

NOTE: The flag that's being added depends on docker/cli#121, so I've updated the CLI commit.

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@nishanttotla nishanttotla force-pushed the no-registry-contact-stack-deploy branch from f65f813 to b1e9dfd Compare June 13, 2017 21:42
@nishanttotla
Copy link
Contributor Author

Also updated tests that were failing because they didn't account for the default latest digest added to service images.

@nishanttotla
Copy link
Contributor Author

Ping @aaronlehmann @vdemeester @tiborvass this PR is ready now. I'm not sure if it's okay to update the CLI commit hash, but the tests should be updated (note that these fixes were already part of the cherry picks into RC2 and RC3 for 17.06).

@aaronlehmann
Copy link

LGTM

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

I'd like to have consensus on our approach for bumping the CLI first; I'll see if we can discuss this ASAP

@nishanttotla
Copy link
Contributor Author

@thaJeztah sounds good. I updated CLI here to make sure tests pass.

# CLI
DOCKERCLI_REPO=https://github.com/docker/cli
DOCKERCLI_COMMIT=3dfb8343b139d6342acfd9975d7f1068b5b1c3d3
DOCKERCLI_COMMIT=4d980880f30eddec01dbe4328e0cd656a52b502b
Copy link
Contributor

Choose a reason for hiding this comment

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

i'm not sure about this :S

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tiborvass that makes two of us.

Copy link
Contributor

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

I suggest changing the scripts to install docker cli by downloading the released 17.06 static binary. Probably in a separate PR to not conflate the two problems.

@aaronlehmann
Copy link

Let's not block this PR because we want to make changes to how the CLI is installed. Without these changes to the tests, the tests won't run correctly with the released 17.06 binary anyway.

@aaronlehmann
Copy link

Has a decision been made about this one?

@dnephin
Copy link
Member

dnephin commented Jul 11, 2017

I agree we should open a PR to pin the client at the 17.06 release version.

These tests should be deleted, not updated. They're only testing the cli, so they are not providing any value in this repo. They won't catch any regressions to the cli because they are not run as part of cli changes.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants