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.

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

Jump to bottom

Prep node_e2e for GCI to COS name change #40326

Merged
merged 1 commit into from
Jan 26, 2017
Merged

Prep node_e2e for GCI to COS name change #40326

merged 1 commit into from
Jan 26, 2017

Conversation

mtaufen
Copy link
Contributor

@mtaufen mtaufen commented Jan 23, 2017

GCI will soon change name in etc/os-release from "gci" to "cos".

This prepares the node_e2e tests to deal with that change and also updates some comments/log messages/var names in anticipation.

@mtaufen mtaufen added area/node-e2e priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. labels Jan 23, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 23, 2017
@k8s-reviewable
Copy link

This change is Reviewable

mtaufen
mtaufen commented Jan 23, 2017
View reviewed changes
test/e2e_node/remote/node_e2e.go
output, err := SSH(host, "cat", "/etc/os-release")
if err != nil {
return args, fmt.Errorf("issue detecting node's OS via node's /etc/os-release. Err: %v, Output:\n%s", err, output)
}
if !strings.Contains(output, "ID=gci") {
// This is not a GCI image
if !strings.Contains(output, "ID=gci") && !strings.Contains(output, "ID=cos") {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the functional change in this PR. Pointing it out because changing comments/log messages creates a lot of noise in the diff.

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 23, 2017
@mtaufen
Copy link
Contributor Author

mtaufen commented Jan 24, 2017

/cc @adityakali

@adityakali
Copy link
Contributor

/lgtm
Looks like my PR #40230 is redundant. This one is more comprehensive. I will abandon mine. Thanks!

@k8s-ci-robot
Copy link
Contributor

@adityakali: you can't LGTM a PR unless you are an assignee.

In response to this comment:

/lgtm
Looks like my PR #40230 is redundant. This one is more comprehensive. I will abandon mine. Thanks!

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@adityakali adityakali mentioned this pull request Jan 24, 2017
Closed
@Random-Liu
Copy link
Member

/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 25, 2017
@Random-Liu
Copy link
Member

/approve

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: Random-Liu

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 7bce538 into kubernetes:master Jan 26, 2017
@adityakali
Copy link
Contributor

/cc @dchen1107
Do you want to cherry-pick this change in 1.4 & 1.5 as well in case you decide to upgrade to new images in future for those branches? All new releases now have "ID=cos" in /etc/os-release. Also, this is a test-only change.

@adityakali adityakali mentioned this pull request Feb 6, 2017
Merged
@dchen1107 dchen1107 added this to the v1.5 milestone Feb 6, 2017
@dchen1107
Copy link
Member

cc/ @saad-ali for 1.5 patch release, and @jessfraz on 1.4 patch. The reason of patching is well said by @adityakali at #40326 (comment)

@jessfraz
Copy link
Contributor

jessfraz commented Feb 6, 2017

hmm this file does not exist on my branch, but will look more into it

@mtaufen
Copy link
Contributor Author

mtaufen commented Feb 6, 2017

In 1.4 the file is https://github.com/kubernetes/kubernetes/blob/release-1.4/test/e2e_node/remote/remote.go

Some things have been rearranged recently.

jessfraz added a commit to jessfraz/kubernetes that referenced this pull request Feb 7, 2017
@jessfraz
apply kubernetes#40326 on release-1.4: Prep node_e2e for GCI to COS n…
8663b66 
…ame change

Signed-off-by: Jess Frazelle <acidburn@google.com>
@jessfraz
Copy link
Contributor

jessfraz commented Feb 7, 2017

opened #41088

@saad-ali saad-ali added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 9, 2017
saad-ali added a commit to saad-ali/kubernetes that referenced this pull request Feb 9, 2017
@saad-ali
apply kubernetes#40326 to 1.5: Prep node_e2e for GCI to COS name change
fe8ef98
@saad-ali saad-ali mentioned this pull request Feb 9, 2017
Merged
@saad-ali
Copy link
Member

saad-ali commented Feb 9, 2017

1.5 cherry pick in #41170 -- please take a look

jessfraz added a commit that referenced this pull request Feb 9, 2017
@jessfraz
Merge pull request #41088 from jessfraz/cherry-pick-40326
dabd200 
apply #40326 on release-1.4: Prep node_e2e for GCI to COS name change
k8s-github-robot pushed a commit that referenced this pull request Feb 10, 2017
Merge pull request #41170 from saad-ali/cherrypick40326
2670f7a 
Automatic merge from submit-queue

Cherry pick PR #40326 to release-1.5: Prep node_e2e for GCI to COS name change

Cherry pick the critical part of PR #40326 to `release-1.5` branch.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

robdaemon pushed a commit to hpcloud/kubernetes that referenced this pull request Feb 14, 2017
@saad-ali
apply kubernetes#40326 to 1.5: Prep node_e2e for GCI to COS name change
f26ff94
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Random-Liu Random-Liu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/node-e2e cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
10 participants
@mtaufen @k8s-reviewable @adityakali @k8s-ci-robot @Random-Liu @k8s-github-robot @dchen1107 @jessfraz @saad-ali @k8s-cherrypick-bot