Skip to content

move to cri-o/cri-o and build with containers/conmon#2844

Merged
openshift-merge-robot merged 2 commits into
containers:masterfrom
haircommander:cri-o-update
May 17, 2019
Merged

move to cri-o/cri-o and build with containers/conmon#2844
openshift-merge-robot merged 2 commits into
containers:masterfrom
haircommander:cri-o-update

Conversation

@haircommander
Copy link
Copy Markdown
Collaborator

@haircommander haircommander commented Apr 3, 2019

Signed-off-by: Peter Hunt pehunt@redhat.com

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M labels Apr 3, 2019
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 3, 2019
@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 3, 2019

/retest

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 3, 2019

Move doesn't seem complete, so I'll mark this WIP for now - feel free to un-WIP once the repo changes locations officially

@mheon mheon changed the title s|kubernetes-sigs/cri-o|cri-o/cri-o|g [WIP] s|kubernetes-sigs/cri-o|cri-o/cri-o|g Apr 3, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 3, 2019
@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 3, 2019

/approve

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

openshift-ci-robot commented Apr 3, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mheon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Apr 3, 2019
mheon
mheon reviewed Apr 3, 2019
View reviewed changes
Comment thread contrib/cirrus/lib.sh Outdated
mheon
mheon reviewed Apr 3, 2019
View reviewed changes
Comment thread contrib/cirrus/packer/prior_fedora_base-setup.sh Outdated
@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 3, 2019

Alright, I can see cri-o/cri-o, but Github is really, really unhappy about the fact that it moved, and the main page doesn't want to load yet.

Let's give this a few hours to settle, then.

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

Alright, I think this has settled enough. Removing WIP.

@mheon mheon changed the title [WIP] s|kubernetes-sigs/cri-o|cri-o/cri-o|g s|kubernetes-sigs/cri-o|cri-o/cri-o|g Apr 4, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 4, 2019
@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

/retest images

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

LGTM once tests go green
@rhatdan @baude @vrothberg @giuseppe @TomSweeneyRedHat PTAL

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

/retest

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

Actually, un-LGTM - we should figure out with @cevich what happened with the symlinked file

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 4, 2019

@haircommander I think the images failure might be legitimate... @baude that means we broke RPM builds, right?

@cevich
Copy link
Copy Markdown
Member

cevich commented Apr 5, 2019

@mheon that file should be a symlink as currently the F28 and F29 VM images build exactly the same. When F30 officially arrives, that could change. My best guess is a simple accident caused it to change into a file.

@cevich
Copy link
Copy Markdown
Member

cevich commented Apr 5, 2019

Oh and BTW, this PR inspired me to do containers/conmon#15 which is all-green also 😄

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 5, 2019

@cevich is there action I need to take on the symlink thing?

@cevich
Copy link
Copy Markdown
Member

cevich commented Apr 5, 2019 •
edited
Loading

@haircommander yes please...just put the symlink back 😄

cd contrib/cirrus/packer
ln -sf fedora_base-setup.sh prior_fedora_base-setup.sh
git add prior_fedora_base-setup.sh

Thanks for checking.

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 8, 2019

@mheon yeah it is. the error is confusing to me but I'll look into it

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 8, 2019

/test images

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 8, 2019

Ah shoot yeah the AMI has to be changed for ci/prow/images. Let me see if I have permission to do so

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 8, 2019

Update, I can't find them. I guess we'll have to wait until @cevich is back :\

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 30, 2019

@baude You're the closest thing we have to an expert on the Prow stuff - any idea what we need to do here, or are we tagging in Steve to figure it out?

@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented Apr 30, 2019

@cevich are you able to change the AMI to not use kubernetes-sigs directory anymore?

@mheon
Copy link
Copy Markdown
Member

mheon commented Apr 30, 2019

These aren't AMIs, they're container images - we're on the newer Prow CI system. I don't know where the Dockerfiles live though - presumably somewhere hosted by Prow.

@cevich
Copy link
Copy Markdown
Member

cevich commented May 2, 2019

Oh gosh, I spent a day reading through Prow and OpenShift/release docs and readmes. My ears began bleeding brain matter. However, this is more than likely due to my lack of OpenShift/Kube expertise. This may make much more sense to someone else.

@rh-atomic-bot
Copy link
Copy Markdown
Collaborator

rh-atomic-bot commented May 2, 2019

☔ The latest upstream changes (presumably #3053) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2019
@haircommander
s|kubernetes-sigs/cri-o|cri-o/cri-o|g
3833397 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@openshift-ci-robot openshift-ci-robot added size/S and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M labels May 17, 2019
@haircommander haircommander changed the title s|kubernetes-sigs/cri-o|cri-o/cri-o|g move to cri-o/cri-o and build with containers/conmon May 17, 2019
@haircommander
Use containers/conmon
cb0d89c 
There were some build issues updating cri-o to cri-o/cri-o. Since the only thing we need cri-o for is conmon, we should just build using conmon.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander
Copy link
Copy Markdown
Collaborator Author

haircommander commented May 17, 2019

Ideally we could land containers/conmon#20 to have the latest and greatest conmon before merging this

@mheon
Copy link
Copy Markdown
Member

mheon commented May 17, 2019

Works for me

@haircommander haircommander mentioned this pull request May 17, 2019
Merged
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented May 17, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 17, 2019
@openshift-merge-robot openshift-merge-robot merged commit 00ecbfc into containers:master May 17, 2019
@rh-atomic-bot rh-atomic-bot mentioned this pull request May 17, 2019
Merged
7 tasks
@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

@mheon mheon mheon left review comments

@mrunalp mrunalp Awaiting requested review from mrunalp

+1 more reviewer

@cevich cevich cevich left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@rhatdan rhatdan

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

@haircommander @mheon @openshift-ci-robot @cevich @rh-atomic-bot @rhatdan @openshift-merge-robot