Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/tools/ensure-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
# TODO: consider enforcing a particular version locally as well to avoid confusion
if ! command -v kind; then
local repo_gobin="${REPO_ROOT}/_bin"
GOBIN="${repo_gobin}" go install sigs.k8s.io/kind@v0.25.0
GOBIN="${repo_gobin}" go install sigs.k8s.io/kind@v0.30.0
export PATH="${repo_gobin}:${PATH}"
fi
4 changes: 2 additions & 2 deletions pkg/pj-on-kind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ function ensureInstall() {
echo "Installing kind..."
if [[ $go_minor_version -ge 18 ]]; then
# `go get` is fully deprecated in Go 1.18, so use `go install` for version >= 18.
GO111MODULE="on" go install sigs.k8s.io/kind@v0.17.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.30.0
else
GO111MODULE="on" go get sigs.k8s.io/kind@v0.17.0
GO111MODULE="on" go get sigs.k8s.io/kind@v0.30.0
fi
fi
local found="false"
Expand Down
16 changes: 12 additions & 4 deletions test/integration/test/deck_test.go
Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems unrelated, is there a reason we need to do this due to the kind bump?

Copy link
Contributor Author

@kishen-v kishen-v Sep 28, 2025

Choose a reason for hiding this comment

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

Hi @smg247, thanks for reviewing the PR.
This change was done to reduce the flakey nature of TestRerun in the integration test suite.

On observing the associated logs, the rerun() call, when invoked subsequently was mostly a hit or miss. Providing sufficient time before rerun allowed the test case to pass successfully even run in loops. The cue was taken from the preceeding code, and the associated log line - Response body: Job successfully triggered. Wait 30 seconds and refresh the page for the job to show up..

Similar examples:
1971657033849507840
1971657033849507840
1967608691955863552
and so on..

Allowing some time seems to have reduced the chance of failure, please let me know your thoughts on this

Thanks!

Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ func TestDeckTenantIDs(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

//Give them new names to prevent conflict
// Give them new names to prevent conflict
name := RandomString(t)
prowjobs := renamePJs(tt.prowjobs, name)
expected := renamePJs(tt.expected, name)
Expand Down Expand Up @@ -504,11 +504,19 @@ func TestRerun(t *testing.T) {
if !passed {
t.Fatal("Expected updated job.")
}

passed = false
// Deck scheduled job from latest configuration, rerun with "original"
// should still go with original configuration.
rerun(t, jobToRerun.Name, "original")
if latestRun := getLatestJob(t, jobName, &latestRun.CreationTimestamp); latestRun.Labels["foo"] != "foo" {
// check every 30s interval three times for it update
for i := 0; i < 3; i++ {
time.Sleep(30 * time.Second)
rerun(t, jobToRerun.Name, "original")
if latestRun = getLatestJob(t, jobName, &latestRun.CreationTimestamp); latestRun.Labels["foo"] == "foo" {
passed = true
break
}
}
if !passed {
t.Fatalf("Job label mismatch. Want: 'foo', got: '%s'", latestRun.Labels["foo"])
}
}
Expand Down