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

test/node-e2e: Update CoreOS update disabling #31653

Merged
merged 1 commit into from
Aug 30, 2016
Merged

test/node-e2e: Update CoreOS update disabling #31653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions test/e2e_node/jenkins/coreos-init.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
Copy link

Choose a reason for hiding this comment

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

You don't need the users section anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See passwd.users section, it contains the same basic information. Sorry for the re-ordering! I was going by the ignition spec for my order this time.

"ignition":{"version": "2.0.0"},
"systemd": {
"units": [{
"name": "update-engine.service",
"mask": true
},
{
"name": "locksmithd.service",
"mask": true
},
{
"name": "docker.service",
"dropins": [{
"name": "10-disable-systemd-cgroup-driver.conf",
"contents": "[Service]\nCPUAccounting=yes\nMemoryAccounting=yes\nEnvironment=\"DOCKER_CGROUPS=\""
}]
}]
Copy link

Choose a reason for hiding this comment

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

What about the node-e2e-test-setup.service? No longer needed?

Copy link
Member

Choose a reason for hiding this comment

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

Same question here. :)

Copy link
Contributor Author

@euank euank Aug 30, 2016 •
edited

Choose a reason for hiding this comment

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

It was empty before, now it's gone. We'll add it back if/when we ever need it.

It was a premature optimization to include it at all, sorry!

},
"passwd": {
"users": [{
"name": "jenkins",
"create": {
"groups": ["docker", "sudo"]
}
}]
}
}

36 changes: 0 additions & 36 deletions test/e2e_node/jenkins/coreos-init.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/e2e_node/jenkins/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ images:
coreos-alpha:
image: coreos-alpha-1122-0-0-v20160727
project: coreos-cloud
metadata: "user-data<test/e2e_node/jenkins/coreos-init.yaml"
metadata: "user-data<test/e2e_node/jenkins/coreos-init.json"
containervm:
image: e2e-node-containervm-v20160321-image
project: kubernetes-node-e2e-images
Expand Down