Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.11] update trust tests for 17.11#278

Merged
andrewhsu merged 2 commits into
docker-archive:17.11from
riyazdf:update-tests-for-17.11
Oct 30, 2017
Merged

[17.11] update trust tests for 17.11#278
andrewhsu merged 2 commits into
docker-archive:17.11from
riyazdf:update-tests-for-17.11

Conversation

@riyazdf
Copy link
Copy Markdown

@riyazdf riyazdf commented Oct 30, 2017

cc @andrewhsu @seemethere

@andrewhsu
Copy link
Copy Markdown
Contributor

andrewhsu commented Oct 30, 2017

FYI the docker-ce master branch has just been updated with latest code from upstream this morning.

Can you also describe the cherry-pick command and if there was a conflict?

@riyazdf
update integration-cli tests for stderr output
250b84e 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
@riyazdf riyazdf force-pushed the update-tests-for-17.11 branch from 37f2e48 to f97419a Compare October 30, 2017 17:24
@riyazdf
Copy link
Copy Markdown
Author

riyazdf commented Oct 30, 2017

ok just rebased.

No conflict on the cherry-pick, it's the same commit from @seemethere to disable tests that break due to notary version mismatches in moby vs. docker/cli and assume forwards-compatibility.

@andrewhsu
Copy link
Copy Markdown
Contributor

andrewhsu commented Oct 30, 2017

I can confirm the code change for this PR brings the tests green for DockerTrustSuite: https://jenkins.dockerproject.org/job/docker-ce-pr/308/execution/node/718/log/

For cherry-pick commit, need to pass more args to decorate commit with more ornaments, e.g.:

$ git cherry-pick -s -x badbeef

It'll help leave a trail in case future selves need to walk backwards.

Also, this will need to be rebased to the 17.11 branch when it is cut.

@andrewhsu andrewhsu added this to the 17.11.0 milestone Oct 30, 2017
@seemethere @riyazdf
Blacklist tests, will be rewritten later on
ec6b0a1 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4e81e4f)
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
@riyazdf riyazdf force-pushed the update-tests-for-17.11 branch from f97419a to ec6b0a1 Compare October 30, 2017 18:12
@andrewhsu andrewhsu changed the base branch from master to 17.11 October 30, 2017 21:59
andrewhsu
andrewhsu approved these changes Oct 30, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

branch for 17.11 has been cut, bringing this one in

@andrewhsu andrewhsu merged commit 19d1dd5 into docker-archive:17.11 Oct 30, 2017
@riyazdf riyazdf deleted the update-tests-for-17.11 branch October 31, 2017 10:42
@andrewhsu andrewhsu mentioned this pull request Dec 9, 2017
Merged
docker-jenkins pushed a commit that referenced this pull request Feb 21, 2018
Merge pull request #278 from ishidawataru/sctp
53fd7b9 
Support SCTP port mapping
Upstream-commit: 64f92fd07c92dcb312500bbc3447f1b490b494b9
Component: cli
docker-jenkins pushed a commit that referenced this pull request Dec 3, 2018
@seemethere
Merge pull request #278 from andrewhsu/go
24f0a08 
[master] bump golang to 1.10.5
Upstream-commit: ac1b8f6
Component: packaging
wherka pushed a commit to wherka/docker-ce that referenced this pull request Dec 18, 2018
@seemethere
Merge pull request docker-archive#278 from andrewhsu/go
3954442 
[master] bump golang to 1.10.5
Upstream-commit: ac1b8f6
Component: packaging
Upstream-commit: 24f0a08
Component: cli
docker-jenkins pushed a commit that referenced this pull request Sep 23, 2019
@andrewhsu
Merge pull request #278 from thaJeztah/18.09_backport_attach_to_exist…
0e4be42 
…ing_network_error

[18.09 backport] Handle the error case when a container reattaches to the same network
Upstream-commit: c3e816c6f914a60e395f9b5f11942720de433b31
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
@andrewhsu
Merge pull request docker-archive#278 from riyazdf/update-tests-for-1…
71330f1 
…7.11

[17.11] update trust tests for 17.11
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
@seemethere
Merge pull request docker-archive#278 from andrewhsu/go
ac1b8f6 
[master] bump golang to 1.10.5
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@andrewhsu andrewhsu andrewhsu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

17.11.0

Development

Successfully merging this pull request may close these issues.

3 participants

@riyazdf @andrewhsu @seemethere