Skip to content

[19.03 backport] CI and testing improvements - #2048

Merged
andrewhsu merged 7 commits into
docker:19.03from
thaJeztah:19.03_backport_ci_improvements
Aug 22, 2019
Merged

[19.03 backport] CI and testing improvements#2048
andrewhsu merged 7 commits into
docker:19.03from
thaJeztah:19.03_backport_ci_improvements

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Aug 15, 2019•
edited
Loading

Copy link
Copy Markdown
Member

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

@thaJeztah
Circle-CI: fix indentation in circle.yml
caad34c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 53fc63a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Update CircleCI Docker version to 18.09.3
1572845
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>
@thaJeztah
Update dockerignore
c30ccb3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82e0180)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Circle-CI: enable buildkit
6a3eb41
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9a6519d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Circle-CI: use progress=plain
59b02c0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ae58e35)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
e2e: enable buildkit
2907276
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 893db86)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
e2e: remove docker engine testing remnants
be9adbd
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>
@thaJeztahthaJeztah added this to the 19.03.2 milestone Aug 15, 2019
@thaJeztah

thaJeztah commented Aug 15, 2019

Copy link
Copy Markdown
MemberAuthor

@andrewhsu@tiborvass PTAL

@codecov-io

codecov-io commented Aug 15, 2019

Copy link
Copy Markdown

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

codecov-io commented Aug 15, 2019

Copy link
Copy Markdown

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

andrewhsu
andrewhsu approved these changes Aug 22, 2019
View reviewed changes

@andrewhsuandrewhsu left a comment

Copy link
Copy Markdown
Contributor

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.03Aug 22, 2019
@thaJeztah
thaJeztah deleted the 19.03_backport_ci_improvements branch August 22, 2019 17:57
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@andrewhsuandrewhsuandrewhsu approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/testingstatus/2-code-review

Projects

None yet

Milestone

19.03.2

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah@codecov-io@andrewhsu@GordonTheTurtle