Skip to content

[17.06] migrate to CircleCI 2.0, and CI fixes - #2698

Closed
thaJeztah wants to merge 8 commits into
moby:bump_v17.06from
thaJeztah:17.06-circle-2.0
Closed

[17.06] migrate to CircleCI 2.0, and CI fixes#2698
thaJeztah wants to merge 8 commits into
moby:bump_v17.06from
thaJeztah:17.06-circle-2.0

Conversation

@thaJeztah

@thaJeztah thaJeztah commented Jul 8, 2018 •
edited
Loading

Copy link
Copy Markdown
Member

This migrates the 17.06 branch to use CircleCI 2.0, making sure that CI can still run after August.
Also included are various version bumps, and fixes to CI that were not yet in the 17.06 branch.

Backports:

extra commit:

[17.06] downgrade Go to 1.8.7

changes since Go 1.8.4:

  • go1.8.5 (released 2017/10/25) includes fixes to the compiler, linker,
    runtime, documentation, go command, and the crypto/x509 and net/smtp
    packages. It includes a fix to a bug introduced in Go 1.8.4 that broke go get
    of non-Git repositories under certain conditions. See the Go 1.8.5 milestone
    on our issue tracker for details.
  • go1.8.6 (released 2018/01/22) includes the same fix in math/big as Go 1.9.3
    and was released at the same time. See the Go 1.8.6 milestone on our issue
    tracker for details.
  • go1.8.7 (released 2018/02/07) includes a security fix to "go get". It
    contains the same fix as Go 1.9.4 and was released at the same time. See the
    Go 1.8.7 milestone on our issue tracker for details.
git checkout -b 17.06-circle-2.0 upstream/bump_v17.06


# https://github.com/docker/swarmkit/pull/2248
git cherry-pick -s -S -x b5c4335827eade52ab960f037a38085bdb3fcd00

# https://github.com/docker/swarmkit/pull/2254
git cherry-pick -s -S -x ff0a39725b9469db101e01ae0ab4d61a70d1c754

# https://github.com/docker/swarmkit/pull/2395
git cherry-pick -s -S -x 6d2c849853d5f7439b86d579a2ef2e727f6e78de

# https://github.com/docker/swarmkit/pull/2489
git cherry-pick -s -S -x 2d27a21b5776827f0918d10db5f62979b7cf2a2b

# https://github.com/docker/swarmkit/pull/2636
git cherry-pick -s -S -x 0ad63eaff3733cf1175d667c5e2ce6e8660089ba

# https://github.com/docker/swarmkit/pull/2659
git cherry-pick -s -S -x 19114b466a3bf1a538e40d641f809d9d3bf74515

conflict:

Changes to be committed:

new file:   .circleci/config.yml

Unmerged paths:
(use "git add/rm ..." as appropriate to mark resolution)

deleted by them: circle.yml




# https://github.com/docker/swarmkit/pull/2690
git cherry-pick -s -S -x 7fc0c4f3a35bd7d9e8c26f6d86acf7e2718eb778

cyli and others added 8 commits July 8, 2018 12:11
@cyli @thaJeztah
Bump go verison up to 1.8.3 for security updates, etc., and remove in…
33ea79b 
…stalling the

extra mockgen package when installing dependencies.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit b5c4335)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Aaron Lehmann @thaJeztah
Run CI with temporary files on a ramdisk
2a66d64 
This sets up a tmpfs mount to be used for temporary files created by tests.

If this works, hopefully it will fix the excessive I/O latencies that
are blocking tests for long periods and causing them to fail.

As a side effect, this also stores temporary compilation artifacts on
tmpfs.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit ff0a397)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.8.4
f084c78 
Bumps the Go version used to 1.8.4, which contains security fixes;
https://groups.google.com/forum/#!topic/golang-announce/1hZYiemnkdE

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6d2c849)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.9.3
a91cb6d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2d27a21)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.10.3
b98ec1f 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad63ea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cyli @thaJeztah
Convert the circle config file to v2 format, as circle v1 is deprecated
8cfad30 
and will be removed in August 2018.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 19114b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cyli @thaJeztah
Set the GOPATH for the whole job
4ba36d2 
Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 7fc0c4f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
[17.06] downgrade Go to 1.8.7
c0355d2 
changes since Go 1.8.4:

- go1.8.5 (released 2017/10/25) includes fixes to the compiler, linker,
  runtime, documentation, go command, and the crypto/x509 and net/smtp
  packages. It includes a fix to a bug introduced in Go 1.8.4 that broke go get
  of non-Git repositories under certain conditions. See the Go 1.8.5 milestone
  on our issue tracker for details.
- go1.8.6 (released 2018/01/22) includes the same fix in math/big as Go 1.9.3
  and was released at the same time. See the Go 1.8.6 milestone on our issue
  tracker for details.
- go1.8.7 (released 2018/02/07) includes a security fix to "go get". It
  contains the same fix as Go 1.9.4 and was released at the same time. See the
  Go 1.8.7 milestone on our issue tracker for details.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

thaJeztah commented Jul 8, 2018

Copy link
Copy Markdown
Member Author

Marked as "WIP" to discuss if we need to backport the protobuild / protobuf changes

@codecov

codecov Bot commented Jul 8, 2018

Copy link
Copy Markdown

Codecov Report

Merging #2698 into bump_v17.06 will increase coverage by 3.54%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           bump_v17.06    #2698      +/-   ##
===============================================
+ Coverage        57.72%   61.26%   +3.54%     
===============================================
  Files               10      121     +111     
  Lines             1230    20196   +18966     
===============================================
+ Hits               710    12374   +11664     
- Misses             451     6462    +6011     
- Partials            69     1360    +1291

thaJeztah
thaJeztah commented Jul 9, 2018
View reviewed changes
Comment thread .circleci/config.yml
curl -fsSL -o "$HOME/$(basename $PROTOC)" "$PROTOC"
unzip -o "$HOME/$(basename $PROTOC)" -d "$HOME"
sudo cp -R "$HOME/include/google" /usr/local/include
sudo chmod 777 -R /usr/local/include/google

@thaJeztah thaJeztah Jul 9, 2018

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.

Note that the two lines above are actually part of https://github.com/docker/swarmkit/pull/2349/files#diff-29944324a3cbf9f4bd0162dfe3975d88R36, and leaked through due to the rename/move of this file.

Don't think they should really bother if we decide to not include that PR in 17.06

@thaJeztah

thaJeztah commented Jul 12, 2018

Copy link
Copy Markdown
Member Author

Marked as "WIP" to discuss if we need to backport the protobuild / protobuf changes

ping @dperny @anshulpundir PTAL to decide if we should include those changes as well, or if we need to stick with the current set (backporting at a later stage may be more complicated than including it here, so making a decision now would help 😄)

@anshulpundir

anshulpundir commented Jul 13, 2018

Copy link
Copy Markdown
Contributor

decide if we should include those changes as well, or if we need to stick with the current set (backporting at a later stage may be more complicated than including it here, so making a decision now would help 😄)

Makes sense to do it sooner rather than later. I would suggest doing it right after EE16. That way, we keep EE16 as concise. At the same time, we avoid delaying bring these changes in @thaJeztah

@olljanat

olljanat commented Nov 28, 2018

Copy link
Copy Markdown
Contributor

@thaJeztah I can see that even EE17 is released so you probably would like look this one again (found this when I was browsing old PRs).

@thaJeztah thaJeztah changed the title [wip] [17.06] migrate to CircleCI 2.0, and CI fixes [17.06] migrate to CircleCI 2.0, and CI fixes Nov 29, 2018
@thaJeztah

thaJeztah commented Nov 29, 2018

Copy link
Copy Markdown
Member Author

Yes, let me remove "WIP", but it's up to @anshulpundir @dperny to decide 😅

@thaJeztah

thaJeztah commented Apr 13, 2019

Copy link
Copy Markdown
Member Author

LOL; forgot I had this one as I opened it so long ago; I did the same PR again in #2844, and that one at least got merged, so closing this one

@thaJeztah thaJeztah closed this Apr 13, 2019
@thaJeztah
thaJeztah deleted the 17.06-circle-2.0 branch April 13, 2019 20:06
@thaJeztah thaJeztah mentioned this pull request Apr 14, 2019
Closed
@thaJeztah
thaJeztah restored the 17.06-circle-2.0 branch September 25, 2019 13:35
@thaJeztah
thaJeztah deleted the 17.06-circle-2.0 branch July 28, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @anshulpundir @olljanat @cyli