Skip to content
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

[19.03 backport] CI and testing improvements #2048

Merged
merged 7 commits into from
Aug 22, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Aug 15, 2019

Backports of:

# https://github.com/docker/cli/pull/1599 Update CircleCI Docker version to 18.09.3
git cherry-pick -s -S -x 53fc63a93fbceb6af91c50506c197f5af478b5e0 8b19c1d73af85110f819a27f42b5e0a4c3020e48

# https://github.com/docker/cli/pull/2009 CircleCI/Jenkins: use buildkit
git cherry-pick -s -S -x 82e01807bca65843210ef6639679cdd2c063b9ef 9a6519db7696a08bd7ebd78f94641082240127fc ae58e356eadbd1eca6a1c1fe825d236795d0eec8 893db86d6e813223e1e55c81f847e905bccd51a5

# https://github.com/docker/cli/pull/1993 e2e: remove docker engine testing remnants
git cherry-pick -s -S -x de01e72455433f6befee371e8e83ad5f83270461

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 53fc63a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
18.03 has reached EOL; let's use a more current version in CI

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8b19c1d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82e0180)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9a6519d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ae58e35)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 893db86)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These changes were made as part of the `docker engine` feature
in commit fd2f1b3, but later
reverted in f250152 and
b7ec4a4

These lines were forgotten to be removed, and should no longer
be needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit de01e72)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

@andrewhsu @tiborvass PTAL

@codecov-io
Copy link

Codecov Report

Merging #2048 into 19.03 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            19.03    #2048   +/-   ##
=======================================
  Coverage   56.75%   56.75%           
=======================================
  Files         311      311           
  Lines       21820    21820           
=======================================
  Hits        12383    12383           
  Misses       8522     8522           
  Partials      915      915

1 similar comment
@codecov-io
Copy link

Codecov Report

Merging #2048 into 19.03 will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            19.03    #2048   +/-   ##
=======================================
  Coverage   56.75%   56.75%           
=======================================
  Files         311      311           
  Lines       21820    21820           
=======================================
  Hits        12383    12383           
  Misses       8522     8522           
  Partials      915      915

Copy link
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

@andrewhsu andrewhsu merged commit 578ab52 into docker:19.03 Aug 22, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_ci_improvements branch August 22, 2019 17:57
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.

None yet

4 participants