Skip to content

Commit

Permalink
Fix flaky test detetion for updater (#22690)
Browse files Browse the repository at this point in the history
* Fix flaky test detetion for updater

* fixup! Fix flaky test detetion for updater
  • Loading branch information
hugoShaka authored Mar 7, 2023
1 parent b798144 commit 0d6f7a4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,6 @@ test-kube-agent-updater:
cd integrations/kube-agent-updater && $(CGOFLAG) go test -json -tags "$(PAM_TAG) $(FIPS_TAG) $(BPF_TAG)" $(PACKAGES) $(SUBJECT) $(FLAGS) $(ADDFLAGS) \
| tee $(TEST_LOG_DIR)/kube-agent-updater.json \
| ${RENDER_TESTS}
>>>>>>> df20ae6e68 (kube-updater: add root makefile target and dedicated difftest job)

#
# Runs cargo test on our Rust modules.
Expand Down
7 changes: 7 additions & 0 deletions integrations/kube-agent-updater/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ const Version = \"$(VERSION)\"\n\n\
// Gitref is set to the output of \"git describe\" during the build process.\n\
var Gitref string\n"

# $(UPDATER_VERSION_GO) will be written to api/version.go
UPDATER_VERSION_GO="// Code generated by \"make version\". DO NOT EDIT.\n\
package kubeversionupdater\n\n\
const Version = \"$(VERSION)\"\n\n\
// Gitref is set to the output of \"git describe\" during the build process.\n\
var Gitref string\n"

# $(GITREF_GO) will be written to gitref.go
GITREF_GO="// Code generated by \"make version\". DO NOT EDIT.\n\
package teleport\n\n\
Expand All @@ -26,6 +33,7 @@ func init() { Gitref = \"$(GITREF)\" }\n"
setver: helm-version
@printf $(VERSION_GO) | gofmt > version.go
@printf $(API_VERSION_GO) | gofmt > ./api/version.go
@printf $(UPDATER_VERSION_GO) | gofmt > ./integrations/kube-agent-updater/version.go
@printf $(GITREF_GO) | gofmt > gitref.go

# helm-version automatically updates the versions of Helm charts to match the version set in the Makefile,
Expand Down

0 comments on commit 0d6f7a4

Please sign in to comment.