Skip to content

Commit

Permalink
Merge pull request #3316 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…3295-to-release-1.8

[release-1.8] Don't need a repo list for Windows 1.24+
  • Loading branch information
k8s-ci-robot authored Mar 17, 2023
2 parents 3622783 + 3ceddb9 commit 4fc45b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/e2e/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ func latestCIVersion(label string) (string, error) {

// resolveKubetestRepoListPath will set the correct repo list for Windows:
// - if WIN_REPO_URL is set use the custom file downloaded via makefile
// - if CI version is "latest" do not set repo list since they are not needed K8s v1.25+
// - if CI version is "latest" do not set repo list since they are not needed K8s v1.24+
// - if CI version is "latest-1.xx" will compare values and use correct repoList
// - if standard version will compare values and use correct repoList
// - if unable to determine version falls back to using latest
Expand All @@ -675,18 +675,18 @@ func resolveKubetestRepoListPath(version string, path string) (string, error) {
return "", err
}

v125, err := semver.Make("1.25.0-alpha.0.0")
v124, err := semver.Make("1.24.0-alpha.0.0")
if err != nil {
return "", err
}

if currentVersion.GT(v125) {
if currentVersion.GT(v124) {
return "", nil
}

// - prior to K8s v1.21 repo-list-k8sprow.yaml should be used
// since all test images need to come from k8sprow.azurecr.io
// - starting with K8s v1.25 repo lists repo list is not needed
// - starting with K8s v1.24 repo lists repo list is not needed
// - use repo-list.yaml for everything in between which has only
// some images in k8sprow.azurecr.io

Expand Down

0 comments on commit 4fc45b9

Please sign in to comment.