Skip to content

e2e: correct TestSingleAffinities behavior #25943

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.

Sign up for GitHub

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
pkazmierczak merged 2 commits into from
May 30, 2025
Merged

e2e: correct TestSingleAffinities behavior #25943

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d1845
e2e: retry on TestSingleAffinities
pkazmierczak May 28, 2025
6a50469
test refactor
pkazmierczak May 30, 2025
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
25 changes: 20 additions & 5 deletions e2e/affinities/affinities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
package affinities

import (
"github.com/hashicorp/nomad/e2e/framework"
"slices"

"github.com/shoenig/test/must"
"github.com/stretchr/testify/require"

"github.com/hashicorp/nomad/e2e/e2eutil"
"github.com/hashicorp/nomad/e2e/framework"
"github.com/hashicorp/nomad/helper/uuid"
)

Expand Down Expand Up @@ -41,18 +44,30 @@ func (tc *BasicAffinityTest) TestSingleAffinities(f *framework.F) {
allocs := e2eutil.RegisterAndWaitForAllocs(f.T(), nomadClient, "affinities/input/single_affinity.nomad", jobId, "")

jobAllocs := nomadClient.Allocations()
require := require.New(f.T())

// Verify affinity score metadata
for _, allocStub := range allocs {
alloc, _, err := jobAllocs.Info(allocStub.ID, nil)
require.Nil(err)
require.NotEmpty(alloc.Metrics.ScoreMetaData)
must.Nil(f.T(), err)
must.SliceNotEmpty(f.T(), alloc.Metrics.ScoreMetaData)

pickedNodeNormScore := 0.0
normScores := []float64{}
for _, sm := range alloc.Metrics.ScoreMetaData {
score, ok := sm.Scores["node-affinity"]
normScores = append(normScores, sm.NormScore)
if ok {
require.Equal(1.0, score)
// if there's a node-affinity score, check if this node is the node the
// allocation was placed on
if sm.NodeID == allocStub.NodeID {
must.Eq(f.T(), score, 1.0)
pickedNodeNormScore = sm.NormScore
}
}
}
// additionally, make sure that this node had the highest normalized score out
// of all nodes we got
must.Eq(f.T(), pickedNodeNormScore, slices.Max(normScores))
}

}
Expand Down