Skip to content

[release-3.4] Update make verify for prow job #19911

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

Merged
merged 3 commits into from
May 22, 2025

Conversation

joshjms
Copy link
Member

@joshjms joshjms commented May 10, 2025

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

Add relevant checks to make verify for the pull-etcd-verify prow job.

Output using pj-on-kind (expand for issues)
➜  1921752994244726784 cat build-log.txt                
./scripts/verify_go_versions.sh
go: downloading github.com/soheilhy/cmux v0.1.5
go: downloading github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7
go: downloading github.com/spf13/cobra v0.0.3
go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
go: downloading github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf
go: downloading go.uber.org/zap v1.10.0
go: downloading golang.org/x/crypto v0.35.0
go: downloading golang.org/x/net v0.36.0
go: downloading google.golang.org/grpc v1.58.3
go: downloading sigs.k8s.io/yaml v1.1.0
go: downloading github.com/jonboulle/clockwork v0.1.0
go: downloading github.com/grpc-ecosystem/grpc-gateway v1.11.0
go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966
go: downloading go.etcd.io/bbolt v1.3.11
go: downloading github.com/gogo/protobuf v1.3.2
go: downloading github.com/golang/protobuf v1.5.4
go: downloading github.com/prometheus/client_golang v1.11.1
go: downloading github.com/spf13/pflag v1.0.1
go: downloading github.com/coreos/go-semver v0.2.0
go: downloading github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
go: downloading golang.org/x/sys v0.30.0
go: downloading golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
go: downloading github.com/json-iterator/go v1.1.11
go: downloading github.com/modern-go/reflect2 v1.0.1
go: downloading gopkg.in/yaml.v2 v2.4.0
go: downloading github.com/gorilla/websocket v1.4.2
go: downloading github.com/sirupsen/logrus v1.9.3
go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
go: downloading go.uber.org/atomic v1.3.2
go: downloading go.uber.org/multierr v1.1.0
go: downloading github.com/golang-jwt/jwt/v4 v4.5.2
go: downloading google.golang.org/protobuf v1.33.0
go: downloading github.com/google/btree v1.0.0
go: downloading github.com/beorn7/perks v1.0.1
go: downloading github.com/cespare/xxhash/v2 v2.2.0
go: downloading github.com/prometheus/client_model v0.2.0
go: downloading github.com/prometheus/common v0.26.0
go: downloading github.com/prometheus/procfs v0.6.0
go: downloading github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
go: downloading google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98
go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
go: downloading golang.org/x/text v0.22.0
go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.1
go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98
expected go toolchain directive: go1.23.9

PASSES="gofmt" ./test
Running with TEST_CPUS: 1,2,4
Starting 'gofmt' pass at Mon May 12 02:23:34 UTC 2025
Finished 'gofmt' pass at Mon May 12 02:23:35 UTC 2025
Success
PASSES="bom" ./test
Running with TEST_CPUS: 1,2,4
Starting 'bom' pass at Mon May 12 02:23:37 UTC 2025
Skipping bom...
Finished 'bom' pass at Mon May 12 02:23:37 UTC 2025
Success
PASSES="revive" ./test
Running with TEST_CPUS: 1,2,4
Starting 'revive' pass at Mon May 12 02:23:40 UTC 2025
Installing revive v1.3.7
Finished 'revive' pass at Mon May 12 02:23:42 UTC 2025
Success
PASSES="dep" ./test
Running with TEST_CPUS: 1,2,4
Starting 'dep' pass at Mon May 12 02:23:45 UTC 2025
Checking package dependencies...
Finished 'dep' pass at Mon May 12 02:23:45 UTC 2025
Success
PASSES="shellcheck" ./test
Running with TEST_CPUS: 1,2,4
Starting 'shellcheck' pass at Mon May 12 02:23:47 UTC 2025
Installing shellcheck v0.10.0
shellcheck-v0.10.0/LICENSE.txt
shellcheck-v0.10.0/README.txt
shellcheck-v0.10.0/shellcheck
Finished 'shellcheck' pass at Mon May 12 02:23:50 UTC 2025
Success
PASSES="goword" ./test
Running with TEST_CPUS: 1,2,4
Starting 'goword' pass at Mon May 12 02:23:53 UTC 2025
Skipping goword...
Finished 'goword' pass at Mon May 12 02:23:53 UTC 2025
Success
PASSES="govet" ./test
Running with TEST_CPUS: 1,2,4
Starting 'govet' pass at Mon May 12 02:23:56 UTC 2025
go: downloading github.com/stretchr/testify v1.9.0
go: downloading github.com/google/go-cmp v0.5.9
go: downloading github.com/creack/pty v1.1.11
go: downloading github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa
go: downloading github.com/urfave/cli v1.20.0
go: downloading github.com/bgentry/speakeasy v0.1.0
go: downloading github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5
go: downloading gopkg.in/cheggaaa/pb.v1 v1.0.25
go: downloading gopkg.in/yaml.v3 v3.0.1
go: downloading github.com/davecgh/go-spew v1.1.1
go: downloading github.com/pmezard/go-difflib v1.0.0
go: downloading github.com/mattn/go-runewidth v0.0.2
Finished 'govet' pass at Mon May 12 02:24:28 UTC 2025
Success
PASSES="license_header" ./test
Running with TEST_CPUS: 1,2,4
Starting 'license_header' pass at Mon May 12 02:24:31 UTC 2025
Finished 'license_header' pass at Mon May 12 02:24:32 UTC 2025
Success
PASSES="receiver_name" ./test
Running with TEST_CPUS: 1,2,4
Starting 'receiver_name' pass at Mon May 12 02:24:34 UTC 2025
Finished 'receiver_name' pass at Mon May 12 02:24:34 UTC 2025
Success
PASSES="mod_tidy" ./test
Running with TEST_CPUS: 1,2,4
Starting 'mod_tidy' pass at Mon May 12 02:24:37 UTC 2025
go: downloading go.etcd.io/gofail v0.2.0
go: downloading github.com/inconshreveable/mousetrap v1.0.0
go: downloading golang.org/x/sync v0.11.0
go: downloading github.com/fatih/color v1.7.0
go: downloading github.com/mattn/go-colorable v0.0.9
go: downloading github.com/mattn/go-isatty v0.0.4
go: downloading github.com/pkg/errors v0.9.1
go: downloading gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
go: downloading github.com/kr/pretty v0.1.0
go: downloading github.com/kr/text v0.1.0
Finished 'mod_tidy' pass at Mon May 12 02:24:38 UTC 2025
Success
PASSES="markdown_you" ./test
Running with TEST_CPUS: 1,2,4
Starting 'markdown_you' pass at Mon May 12 02:24:41 UTC 2025
Finished 'markdown_you' pass at Mon May 12 02:24:41 UTC 2025
Success
PASSES="markdown_marker" ./test
Running with TEST_CPUS: 1,2,4
Starting 'markdown_marker' pass at Mon May 12 02:24:43 UTC 2025
Skipping marker...
Finished 'markdown_marker' pass at Mon May 12 02:24:43 UTC 2025
Success
./scripts/sync_go_toolchain_directive.sh


Current Issues

  • commit_title doesn't work
  • marker, goword, and bom are skipped

Ref: kubernetes/test-infra#34768

/cc @ivanvc

@joshjms
Copy link
Member Author

joshjms commented May 12, 2025

I'll just remove the fmt Github Actions yaml file in this PR (it will fail since I remove fmt_pass entirely in a backport of #14481)

@joshjms joshjms marked this pull request as ready for review May 12, 2025 02:19
@joshjms
Copy link
Member Author

joshjms commented May 12, 2025

/retest

Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

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

Thanks for the pull request, @joshjms. Please take a look at my suggestion :)

Makefile Outdated
@@ -555,7 +555,59 @@ gofail-disable: install-gofail
PASSES="toggle_failpoints" ./test

.PHONY: verify
verify: verify-go-versions
verify: verify-go-versions verify-gofmt verify-bom verify-revive verify-dep verify-shellcheck verify-goword verify-govet verify-revive verify-license-header verify-receiver-name verify-mod-tidy verify-markdown-you verify-markdown-marker
Copy link
Member

Choose a reason for hiding this comment

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

Looks like verify-revive is duplicated. Could you please remove it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Definitely, must have missed that. Thanks for pointing that out

@joshjms joshjms force-pushed the release-3.4-pull-etcd-verify branch from 368fe3b to 3c842b3 Compare May 16, 2025 02:45
@joshjms
Copy link
Member Author

joshjms commented May 16, 2025

By the way that GA workflow is expected to fail - I'll just remove it

@ivanvc
Copy link
Member

ivanvc commented May 16, 2025

/test etcd-pull-verify

@k8s-ci-robot
Copy link

@ivanvc: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-etcd-govulncheck
/test pull-etcd-release-tests
/test pull-etcd-verify

Use /test all to run all jobs.

In response to this:

/test etcd-pull-verify

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@ivanvc
Copy link
Member

ivanvc commented May 16, 2025

/test pull-etcd-verify

@ivanvc
Copy link
Member

ivanvc commented May 16, 2025

@joshjms, can we squash the last two commits (3c842b3, 6be7850), and remove 5977f0d (mod tidy, note that it will break b5aff13), from this PR? I'm trying to minimize the functionality added in this PR. Then, we'll add it after merging this one. Thanks

@joshjms
Copy link
Member Author

joshjms commented May 16, 2025

Ohh got it, will do

Adds verify-fmt, verify-bom, and verify-dep

Signed-off-by: joshjms <joshjms1607@gmail.com>

test: Add mod_tidy_pass

Signed-off-by: joshjms <joshjms1607@gmail.com>

Revert "test: Add mod_tidy_pass"

This reverts commit 5977f0d.
@joshjms joshjms force-pushed the release-3.4-pull-etcd-verify branch from 6be7850 to 7e355f7 Compare May 17, 2025 14:57
@joshjms joshjms force-pushed the release-3.4-pull-etcd-verify branch from 7e355f7 to 773ff02 Compare May 17, 2025 14:58
@joshjms
Copy link
Member Author

joshjms commented May 17, 2025

Done! PTAL @ivanvc

@ivanvc
Copy link
Member

ivanvc commented May 19, 2025

Joshua, sorry for the back-and-forth. With the new changes and to still backport #14481, aren't we missing the deletion of fmt_pass?

joshjms and others added 2 commits May 21, 2025 08:13
Manual backport of https://github.com/etcd-io/etcd/pull/14481/commits

Co-authored-by: Marek Siarkowicz <siarkowicz@google.com>
Signed-off-by: joshjms <joshjms1607@gmail.com>
Signed-off-by: joshjms <joshjms1607@gmail.com>
@joshjms joshjms force-pushed the release-3.4-pull-etcd-verify branch from 773ff02 to a6c1c23 Compare May 21, 2025 00:13
@joshjms
Copy link
Member Author

joshjms commented May 21, 2025

Joshua, sorry for the back-and-forth. With the new changes and to still backport #14481, aren't we missing the deletion of fmt_pass?

Sorry, done now

Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks, @joshjms.

/cc @jmhbnz

@k8s-ci-robot k8s-ci-robot requested a review from jmhbnz May 21, 2025 21:16
@ivanvc
Copy link
Member

ivanvc commented May 21, 2025

Link to kubernetes/test-infra#32754

Copy link
Member

@jmhbnz jmhbnz left a comment

Choose a reason for hiding this comment

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

LGTM - Great work team 👍🏻

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ivanvc, jmhbnz, joshjms

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jmhbnz jmhbnz merged commit 74fdeaa into etcd-io:release-3.4 May 22, 2025
13 checks passed
@ivanvc
Copy link
Member

ivanvc commented May 22, 2025

@joshjms, can you now backport (or implement) mod tidy in a follow-up pr? Thanks.

@joshjms
Copy link
Member Author

joshjms commented May 22, 2025

Yup I will do that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants