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

Add Ubuntu-18.04 to CI testing #1578

Merged
merged 1 commit into from
Oct 3, 2018
Merged

Add Ubuntu-18.04 to CI testing #1578

merged 1 commit into from
Oct 3, 2018

Conversation

baude
Copy link
Member

@baude baude commented Oct 2, 2018

Signed-off-by: baude [email protected]

@baude
Copy link
Member Author

baude commented Oct 2, 2018

If reviewers don't mind, let me iron things out before commenting...

mheon
mheon requested changes Oct 2, 2018
View reviewed changes
libpod/stats.go Outdated

cgroup, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(cgroupPath))
v1CGroups := GetV1CGroups(getExcludedCGroups())
if err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

No need for the error here, this doesn't return an error

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

libpod/stats.go
@@ -33,13 +33,17 @@ func (c *Container) GetContainerStats(previousStats *ContainerStats) (*Container
if err != nil {
return nil, err
}

cgroup, err := cgroups.Load(cgroups.V1, cgroups.StaticPath(cgroupPath))
v1CGroups := GetV1CGroups(getExcludedCGroups())
Copy link
Member

Choose a reason for hiding this comment

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

Need this change in runtime_pod_linux.go line 268

Copy link
Member Author

Choose a reason for hiding this comment

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

added

cmd/podman/utils.go Outdated
@@ -215,3 +217,26 @@ func getPodsFromContext(c *cli.Context, r *libpod.Runtime) ([]*libpod.Pod, error
}
return pods, lastError
}

// GetV1CGroups gets the V1 cgroup subsystems and then "filters"
Copy link
Member

Choose a reason for hiding this comment

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

Is this duped from libpod/util.go?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah too many util.go, fixed

@mheon
Copy link
Member

mheon commented Oct 2, 2018

Oops, sorry, didn't see your comment until now

giuseppe
giuseppe reviewed Oct 2, 2018
View reviewed changes
test/e2e/libpod_suite_test.go Outdated
runCBinary := "/usr/bin/runc"
altRunCBinary := "/usr/sbin/runc" // ubuntu
if _, err := os.Stat(runCBinary); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

could we use os.LookPath("runc") here?

Copy link
Member Author

Choose a reason for hiding this comment

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

given that /usr/sbin should be in the path, I guess it would work nicely ... everyone prefer that?

Copy link
Member

Choose a reason for hiding this comment

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

SGTM

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@baude baude force-pushed the addubuntuci branch 2 times, most recently from 38b148e to 170910c Compare October 2, 2018 19:43
rhatdan
rhatdan reviewed Oct 3, 2018
View reviewed changes
Copy link
Member

@rhatdan rhatdan left a comment

Choose a reason for hiding this comment

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

LGTM

@jlebon
Copy link
Contributor

jlebon commented Oct 3, 2018

The makecache failure is simply because Ubuntu is not supported in PAPR. For a list of supported platforms, see https://github.com/projectatomic/papr/blob/master/docs/DISTROS.md.

Thread about Ubuntu support: projectatomic/papr#57. As mentioned there, trivial patches to get it working in Ubuntu would probably be accepted. Though at this point, I consider PAPR to be in maintenance mode until we decide the path forward (see projectatomic/papr#62).

Suggestions:

  • use podman run --privileged docker.io/ubuntu:18.04 ...
  • if full virtualization is a hard requirement, you can try curling an Ubuntu cloud image and then running qemu-kvm. We can look into mirroring the image somewhere to make that more efficient.

@baude
Copy link
Member Author

baude commented Oct 3, 2018

given that testing with papr is a no-go, i re-enabled travis and disabled the attempt to test in papr. there is still relevant code here that fixes bonified problems on modern ubuntu distributions and will be critical to testing once we figure out how/where.

mheon
mheon approved these changes Oct 3, 2018
View reviewed changes
Copy link
Member

@mheon mheon left a comment

Choose a reason for hiding this comment

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

The CGroup and test changes LGTM

@mheon
Copy link
Member

mheon commented Oct 3, 2018

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 3, 2018
@baude
Copy link
Member Author

baude commented Oct 3, 2018

bot, retest this please

@baude
Add ability for ubuntu to be tested
1447327 
unfortunately the papr CI system cannot test ubuntu as a VM; therefore,
this PR still keeps travis.  but it does include fixes that will be required
for running on modern versions of ubuntu.

Signed-off-by: baude <[email protected]>
@baude
Copy link
Member Author

baude commented Oct 3, 2018

because we have two LGTMs, im going to /lgtm

@baude
Copy link
Member Author

baude commented Oct 3, 2018

/lgtm

@openshift-ci-robot
Copy link
Collaborator

@baude: you cannot LGTM your own PR.

In response to this:

/lgtm

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.

@mheon
Copy link
Member

mheon commented Oct 3, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2018
@openshift-merge-robot openshift-merge-robot merged commit 3750b35 into containers:master Oct 3, 2018
@rh-atomic-bot rh-atomic-bot mentioned this pull request Oct 3, 2018
Merged
@baude baude deleted the addubuntuci branch December 22, 2019 18:44
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rhatdan rhatdan rhatdan left review comments

@giuseppe giuseppe giuseppe left review comments

@mheon mheon mheon approved these changes

Assignees

@mheon mheon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@baude @mheon @jlebon @openshift-ci-robot @giuseppe @rhatdan @openshift-merge-robot