Skip to content
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

Test package versions as well as hashes #8360

Merged
merged 1 commit into from
Jan 17, 2020

Conversation

justinsb
Copy link
Member

Extend the existing "unit" test to check package versions, because
some of the docker packages now have a '5:' prefix.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 17, 2020
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 17, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2020
if version != expectedVersion {
return fmt.Errorf("unexpected version, actual=%q, expected=%q", version, expectedVersion)
}
} else if strings.HasSuffix(u, ".tgz") {
Copy link
Member

@hakman hakman Jan 17, 2020

Choose a reason for hiding this comment

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

Packages for conatinerd have a tar.gz suffix:
https://github.com/kubernetes/kops/pull/8199/files#diff-ecf61990c0cdda1c13ad07df0440a537R116-R135

Suggested change
} else if strings.HasSuffix(u, ".tgz") {
} else if strings.HasSuffix(u, ".tgz") || strings.HasSuffix(u, ".tar.gz") {

Copy link
Member Author

Choose a reason for hiding this comment

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

Good call - added!

return fmt.Errorf("did not expect version for tgz package")
}
} else {
return fmt.Errorf("unexpected suffix for file (not .rpm or .deb)")
Copy link
Member

Choose a reason for hiding this comment

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

Maybe also list .tgz and .tar.gz and the file name.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks - done!

Extend the existing "unit" test to check package versions, because
some of the docker packages now have a '5:' prefix.

Also correct the package versions that didn't have the prefix.
@hakman
Copy link
Member

hakman commented Jan 17, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 17, 2020
@hakman
Copy link
Member

hakman commented Jan 17, 2020

/retest

@k8s-ci-robot k8s-ci-robot merged commit a603e40 into kubernetes:master Jan 17, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants