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

[18.09 backport] Windows: Start of enabling tests under integration - #80

Merged
andrewhsu merged 3 commits into
docker-archive:18.09from
thaJeztah:18.09_backport_windows_enable_integration
Nov 14, 2018
Merged

[18.09 backport] Windows: Start of enabling tests under integration#80
andrewhsu merged 3 commits into
docker-archive:18.09from
thaJeztah:18.09_backport_windows_enable_integration

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

Backport of moby#37715 for the 18.09 branch

git checkout -b 18.09_backport_windows_enable_integration ce-engine/18.09
git cherry-pick -s -S -x d3cc071bb98669545d4e3043c9bd85879292b815
git cherry-pick -s -S -x 4c8b1fd5a2803e393ad1296692533b7b5c727918
git cherry-pick -s -S -x 7d1c1a411b5c5bd58e657b24261f32d04fa0d8c5
git push -u origin

cherry-pick was clean, no conflicts

Integration tests on Windows.

This was originally @jhowardmsft's work and then vdemeesters and enables the integration tests on windows CI (see moby#36748)
This is also a follow up of moby#35362 — initial description below.
Currently in progress, with a custom job in jenkins.

This change is a requirement for moby#34226.
This change also brings the windowsRS1 build in line with all the other builds, which have an entry point at hack/ci. The windowsRS1 config has been updated to call this script.
This change is important because currently the configuration in jenkins makes too many assumptions about the repo and artifacts created by the build. We need a minimal interface between our CI configuration and the repo, so that we are free to make changes in a PR without requiring complicated acrobatics to support those changes in CI.

@thaJeztah thaJeztah added this to the 18.09.0 milestone Oct 11, 2018
@thaJeztah

Copy link
Copy Markdown
Member Author

Hm.. looks like we need a vendor or vendor bump somewhere;

08:25:17 # github.com/docker/docker/integration/service
08:25:17 integration/service/create_test.go:75:2: undefined: skip
08:25:17 integration/service/create_test.go:125:2: undefined: skip
08:25:17 integration/service/create_test.go:185:2: undefined: skip
08:25:17 integration/service/create_test.go:251:2: undefined: skip

@thaJeztah

Copy link
Copy Markdown
Member Author

right; that import was added in moby#37701 (moby@14da20f#diff-204a9536b52c895f8a02e75d2e00dd16R21), which cannot be included in this PR, so I'll add that import manually

vdemeester and others added 3 commits November 8, 2018 13:55
- Add windows CI entrypoint script.

Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit d3cc071)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Salahuddin Khan <salah@docker.com>
(cherry picked from commit 4c8b1fd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Deep Debroy <ddebroy@docker.com>
(cherry picked from commit 7d1c1a4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztah force-pushed the 18.09_backport_windows_enable_integration branch from d1ce4fb to 9fc9c30 Compare November 8, 2018 12:56
"gotest.tools/assert"
is "gotest.tools/assert/cmp"
"gotest.tools/poll"
"gotest.tools/skip"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

added the missing import

@thaJeztah thaJeztah modified the milestones: 18.09.0, 18.09.1 Nov 8, 2018
@andrewhsu
andrewhsu merged commit 9fc9c30 into docker-archive:18.09 Nov 14, 2018
@thaJeztah
thaJeztah deleted the 18.09_backport_windows_enable_integration branch November 14, 2018 23:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants