ci: validation and unit/integration tests by crazy-max · Pull Request #3100 · moby/swarmkit

crazy-max · 2022-12-03T22:43:23Z

- What I did

Create GHA workflows to validate and run unit/integration tests. This should have the same behavior as CircleCI workflow with some enhancements to reduce build time:

run unit/integration tests in //
each validation (lint, fmt-proto, check protos, vendor) is also done in //

- How I did it

Dockerfile has been changed to handle proto, vendor, lint and fmt-proto validation so we don't need to build the whole image as it is currently. Also adds a bake definition to handle the new stages easily.

In follow-up we can remove the CircleCI workflow if we are happy with GHA ones.

- How to test it

- Description for the changelog

codecov-commenter · 2022-12-03T23:49:10Z

Codecov Report

❗ No coverage uploaded for pull request base (master@67d2b1b). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #3100   +/-   ##
=========================================
  Coverage          ?   61.69%           
=========================================
  Files             ?      153           
  Lines             ?    31094           
  Branches          ?        0           
=========================================
  Hits              ?    19183           
  Misses            ?    10359           
  Partials          ?     1552

Flag	Coverage Δ
coverage	`61.69% <0.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Dockerfile

thaJeztah · 2022-12-04T18:18:57Z

This looks really good, thank you!!

One thing I'm trying to grasp is if this is "correct" or not (looking at the [no statements]);

docker run -t -v swarmkit-cache:/go -v /home/runner/work/swarmkit/swarmkit/:/go/src/github.com/docker/swarmkit moby/swarmkit make coverage-integration
🐳 coverage-integration
go test -race -tags "" -test.short -coverprofile="$(go list -f "{{.Dir}}" github.com/moby/swarmkit/v2/integration)/coverage.txt" -covermode=atomic github.com/moby/swarmkit/v2/integration
ok  	github.com/moby/swarmkit/v2/integration	63.878s	coverage: [no statements]
make[1]: Leaving directory '/home/runner/work/swarmkit/swarmkit'

After that, CodeCov seems to have found something (but perhaps it's empty?)

[2022-12-03T23:56:48.958Z] ['info'] => Project root located at: /home/runner/work/swarmkit/swarmkit
[2022-12-03T23:56:48.964Z] ['info'] -> No token specified or token is empty
[2022-12-03T23:56:48.977Z] ['info'] Searching for coverage files...
[2022-12-03T23:56:49.126Z] ['info'] Warning: Some files located via search were excluded from upload.
[2022-12-03T23:56:49.127Z] ['info'] If Codecov did not locate your files, please review https://docs.codecov.com/docs/supported-report-formats
[2022-12-03T23:56:49.128Z] ['info'] => Found 1 possible coverage files:
  integration/coverage.txt
[2022-12-03T23:56:49.128Z] ['info'] Processing /home/runner/work/swarmkit/swarmkit/integration/coverage.txt...

crazy-max · 2022-12-04T18:23:53Z

One thing I'm trying to grasp is if this is "correct" or not (looking at the [no statements]);

I was wondering that myself but looks to be the same with CircleCI: https://app.circleci.com/pipelines/github/moby/swarmkit/544/workflows/dfd51318-2439-4684-9750-4d67bf257f33/jobs/10927?invite=true#step-109-7

🐳 coverage-integration
go test -race -tags "" -test.short -coverprofile="$(go list -f "{{.Dir}}" github.com/moby/swarmkit/v2/integration)/coverage.txt" -covermode=atomic github.com/moby/swarmkit/v2/integration
ok  	github.com/moby/swarmkit/v2/integration	73.865s	coverage: [no statements]
CircleCI received exit code 0

Coverage looks empty too for integration pkg: https://app.circleci.com/pipelines/github/moby/swarmkit/538/workflows/6f6b9666-8fce-4de0-a768-c03210c5466c/jobs/10921?invite=true#step-110-99

    + ./integration/coverage.txt bytes=13

thaJeztah · 2022-12-15T10:36:21Z

Dockerfile

+FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS gobase
+ARG DEBIAN_FRONTEND
+RUN apt-get update && apt-get install -y --no-install-recommends git make rsync
+WORKDIR /go/src/github.com/docker/swarmkit


Should this be github.com/moby/swarmkit now? (module is named moby/swarmkit/v2)

Would need to first update:

swarmkit/Protobuild.toml

Line 37 in 67d2b1b

prefix = "github.com/docker/swarmkit/api"

otherwise:

#15 0.412 protoc -I.:/go/src/github.com/moby/swarmkit/v2/vendor/github.com/gogo/protobuf:/go/src/github.com/moby/swarmkit/v2/vendor:/go/src:/usr/local/include --gogoswarm_out=plugins=grpc+deepcopy+storeobject+raftproxy+authenticatedwrapper,import_path=github.com/moby/swarmkit/v2/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/field_mask.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgithub.com/docker/swarmkit/protobuf/plugin/plugin.proto=github.com/moby/swarmkit/v2/protobuf/plugin:/go/src /go/src/github.com/moby/swarmkit/v2/api/ca.proto /go/src/github.com/moby/swarmkit/v2/api/control.proto /go/src/github.com/moby/swarmkit/v2/api/dispatcher.proto /go/src/github.com/moby/swarmkit/v2/api/health.proto /go/src/github.com/moby/swarmkit/v2/api/logbroker.proto /go/src/github.com/moby/swarmkit/v2/api/objects.proto /go/src/github.com/moby/swarmkit/v2/api/raft.proto /go/src/github.com/moby/swarmkit/v2/api/resource.proto /go/src/github.com/moby/swarmkit/v2/api/snapshot.proto /go/src/github.com/moby/swarmkit/v2/api/specs.proto /go/src/github.com/moby/swarmkit/v2/api/types.proto /go/src/github.com/moby/swarmkit/v2/api/watch.proto #15 0.415 github.com/docker/swarmkit/api/types.proto: File not found. #15 0.415 github.com/docker/swarmkit/api/specs.proto: File not found. #15 0.421 github.com/docker/swarmkit/protobuf/plugin/plugin.proto: File not found.

(can be done in follow-up)

oh! yes, proto; I recall now that I ran into that myself; perhaps something we should add a comment for to explain "why"

containerized.mk

.github/workflows/validate.yml

direct.mk

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

thaJeztah

LGTM

thaJeztah · 2023-01-03T15:16:54Z

@dperny @corhere @neersighted PTAL

crazy-max force-pushed the ci-bake branch 4 times, most recently from d335145 to 5d94d74 Compare December 3, 2022 23:40

crazy-max marked this pull request as ready for review December 3, 2022 23:49

crazy-max force-pushed the ci-bake branch from 5d94d74 to 96e7cf1 Compare December 3, 2022 23:52

thaJeztah reviewed Dec 4, 2022

View reviewed changes

Dockerfile Outdated Show resolved Hide resolved

crazy-max force-pushed the ci-bake branch from 96e7cf1 to 92b4585 Compare December 4, 2022 18:27

crazy-max requested a review from thaJeztah December 6, 2022 17:50

thaJeztah reviewed Dec 15, 2022

View reviewed changes

crazy-max force-pushed the ci-bake branch 2 times, most recently from 2c8c489 to 9dbf236 Compare December 26, 2022 10:23

crazy-max requested a review from thaJeztah December 26, 2022 10:34

crazy-max force-pushed the ci-bake branch 3 times, most recently from 29e76b8 to c22a945 Compare December 26, 2022 10:53

thaJeztah reviewed Dec 27, 2022

View reviewed changes

direct.mk Outdated Show resolved Hide resolved

crazy-max added 10 commits December 27, 2022 14:52

create bake definition to build dev image

fa120b5

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Dockerfile: stages to generate and validate proto with bake def

6c12afe

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Dockerfile: vendor update and validation with bake def

450a39d

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Dockerfile: lint stage with bake def

f8ec35b

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Dockerfile: fmt-proto stage with bake def

51f3df7

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Makefile: add validate targets for bake

be3523f

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

Makefile: GO_TESTFLAGS var

7d9fb0d

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

ci: validate workflow

251b3e7

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

ci: unit and integration tests

a266996

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

ci: send coverage to codecov

19023d4

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

readme: fix badges

1fbb466

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

crazy-max force-pushed the ci-bake branch from c22a945 to 1fbb466 Compare December 27, 2022 13:52

crazy-max requested a review from thaJeztah December 27, 2022 15:30

thaJeztah approved these changes Dec 29, 2022

View reviewed changes

dperny merged commit 481f030 into moby:master Jan 3, 2023

crazy-max deleted the ci-bake branch January 3, 2023 18:14

crazy-max mentioned this pull request Feb 4, 2023

ci: remove circleci workflow #3114

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ci: validation and unit/integration tests#3100

ci: validation and unit/integration tests#3100
dperny merged 11 commits intomoby:masterfrom
crazy-max:ci-bake

crazy-max commented Dec 3, 2022

Uh oh!

codecov-commenter commented Dec 3, 2022 •

edited

Loading

Uh oh!

Uh oh!

thaJeztah commented Dec 4, 2022

Uh oh!

crazy-max commented Dec 4, 2022 •

edited

Loading

Uh oh!

thaJeztah Dec 15, 2022

Uh oh!

crazy-max Dec 26, 2022 •

edited

Loading

Uh oh!

thaJeztah Dec 27, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thaJeztah left a comment

Uh oh!

thaJeztah commented Jan 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

crazy-max commented Dec 3, 2022

Uh oh!

codecov-commenter commented Dec 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

thaJeztah commented Dec 4, 2022

Uh oh!

crazy-max commented Dec 4, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Dec 15, 2022

Choose a reason for hiding this comment

Uh oh!

crazy-max Dec 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah Dec 27, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jan 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov-commenter commented Dec 3, 2022 •

edited

Loading

crazy-max commented Dec 4, 2022 •

edited

Loading

crazy-max Dec 26, 2022 •

edited

Loading