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

Cirrus: Update to F32 + Use libpod cache images #1971

Merged
merged 6 commits into from
May 4, 2020
Merged

Cirrus: Update to F32 + Use libpod cache images #1971

merged 6 commits into from
May 4, 2020

Conversation

cevich
Copy link
Member

@cevich cevich commented Nov 8, 2019 •
edited
Loading

@cevich cevich changed the title Cirrus: Update to F31 + Use cache images WIP: Cirrus: Update to F31 + Use cache images Nov 8, 2019
@rh-atomic-bot
Copy link
Collaborator

Can one of the admins verify this patch?
I understand the following commands:

  • bot, add author to whitelist
  • bot, test pull request
  • bot, test pull request once

@rhatdan
Copy link
Member

rhatdan commented Nov 8, 2019

bot, add author to whitelist

@rh-atomic-bot
Copy link
Collaborator

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

@cevich cevich force-pushed the support_f31 branch 2 times, most recently from 952f891 to d2f0cc6 Compare December 20, 2019 15:31
@rh-atomic-bot
Copy link
Collaborator

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

@cevich cevich mentioned this pull request Jan 27, 2020
Merged
bors bot added a commit that referenced this pull request Feb 3, 2020
@bors @cevich
Merge #2115
8c83ea1 
2115: WIP: Kill Travis and Enable Bors r=rhatdan a=cevich

***Depends on:***  #1848 #1971 #2121

Co-authored-by: Chris Evich <[email protected]>
bors bot added a commit that referenced this pull request Feb 4, 2020
@bors @cevich @saschagrunert
Merge #2115 #2129 #2138
3be2e74 
2115: Kill Travis and Enable Bors r=rhatdan a=cevich

***Depends on:***  #1848 #1971 #2121

2129: Bors-ng: Add documentation and status-icon r=rhatdan a=cevich

***Note:*** Depends on #2115

Signed-off-by: Chris Evich <[email protected]>

2138: Update containers/common to v0.1.4 r=rhatdan a=saschagrunert

This fixes the 32 bit build issue.

Co-authored-by: Chris Evich <[email protected]>
Co-authored-by: Sascha Grunert <[email protected]>
bors bot added a commit that referenced this pull request Feb 7, 2020
@bors @edsantiago @cevich
Merge #2115
5548b38 
2115: Kill Travis and Enable Bors r=rhatdan a=cevich

***Depends on:***  #1848 #1971 #2036 #2121

Co-authored-by: Ed Santiago <[email protected]>
Co-authored-by: Chris Evich <[email protected]>
bors bot added a commit that referenced this pull request Feb 7, 2020
@bors @edsantiago @cevich
Merge #2115
f727267 
2115: Kill Travis and Enable Bors r=rhatdan a=cevich

***Depends on:***  #1848 #1971 #2036 #2121

Co-authored-by: Ed Santiago <[email protected]>
Co-authored-by: Chris Evich <[email protected]>
bors bot added a commit that referenced this pull request Feb 7, 2020
@bors @edsantiago @cevich
Merge #2115
c210404 
2115: Kill Travis and Enable Bors r=rhatdan a=cevich

***Depends on:***  #1848 #1971 #2036 #2121

Co-authored-by: Ed Santiago <[email protected]>
Co-authored-by: Chris Evich <[email protected]>
@cevich cevich force-pushed the support_f31 branch 4 times, most recently from 9f1eb82 to bf3d111 Compare February 27, 2020 21:25
@cevich
Copy link
Member Author

cevich commented Feb 28, 2020

NOTE TO ME: Put back the buildah-specific package install bit, some parts of the matrix depend on it.

@cevich
Copy link
Member Author

cevich commented Mar 3, 2020

Waiting on checkpoint-restore/criu#973

@cevich cevich changed the title WIP: Cirrus: Update to F31 + Use cache images WIP: Cirrus: Update to F32 + Use libpod cache images Apr 7, 2020
@cevich cevich force-pushed the support_f31 branch 2 times, most recently from 05960b9 to 58dd745 Compare April 14, 2020 16:00
@cevich cevich mentioned this pull request Apr 17, 2020
Merged
@cevich cevich force-pushed the support_f31 branch 4 times, most recently from 71398da to afa427d Compare April 17, 2020 18:24
@cevich cevich force-pushed the support_f31 branch 2 times, most recently from cee7388 to 0fdc471 Compare April 30, 2020 15:22
@cevich cevich changed the title WIP: Cirrus: Update to F32 + Use libpod cache images Cirrus: Update to F32 + Use libpod cache images Apr 30, 2020
@cevich
Copy link
Member Author

cevich commented Apr 30, 2020

@edsantiago @rhatdan @giuseppe @TomSweeneyRedHat PTAL. We got it! Finally, at last, we got it. I peeked at a few results, but please check over-my-shoulder we're lookin' good here.

@cevich cevich mentioned this pull request Apr 30, 2020
Merged
@cevich
Cirrus: Use pre-installed VM packages + F32
278fb81 
All packages required for building + testing buildah are now included in
VM images shared withthe libpod project's CI system.  Remove former
`setup.sh` and `lib.sh` facilities for installing/updating packages.
Also add in a new function for removing the pre-installed buildah
package files (since we run and test from source).  This mirrors
the same behavior used in libpod's CI setup.

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

cevich commented Apr 30, 2020

(Quick/small update of the in_podman container image to use the master tag)

TomSweeneyRedHat
TomSweeneyRedHat reviewed Apr 30, 2020
View reviewed changes
.golangci.yml Outdated Show resolved Hide resolved
@TomSweeneyRedHat
Copy link
Member

LGTM, but definitely would like a head nod from @edsantiago

edsantiago
edsantiago requested changes Apr 30, 2020
View reviewed changes
Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

Still looking, but my first review comments were clobbered by a force-push. Will keep looking but send this out now to avoid further clobbers.

contrib/cirrus/add_second_partition.sh Outdated Show resolved Hide resolved
contrib/cirrus/add_second_partition.sh Outdated Show resolved Hide resolved
edsantiago
edsantiago requested changes Apr 30, 2020
View reviewed changes
Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

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

Couple more change requests, one (test.sh) which may affect results

contrib/cirrus/lib.sh Show resolved Hide resolved
contrib/cirrus/test.sh Show resolved Hide resolved
edsantiago
edsantiago reviewed Apr 30, 2020
View reviewed changes
contrib/cirrus/setup.sh Outdated Show resolved Hide resolved
@edsantiago
Copy link
Member

Sorry for the late reply; I had to restart tests several times.

Buildah tests pass on Rawhide with crun installed, no runc. I believe it is safe to remove the above-noted dnf install runc.

@rhatdan
Copy link
Member

rhatdan commented May 4, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented May 4, 2020

👎 Rejected by code reviews

rhatdan
rhatdan approved these changes May 4, 2020
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

@cevich
Copy link
Member Author

cevich commented May 4, 2020

bors retry

@bors
Copy link
Contributor

bors bot commented May 4, 2020

Build succeeded:

  • cirrus-ci/success

@bors bors bot merged commit 828035f into containers:master May 4, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TomSweeneyRedHat TomSweeneyRedHat TomSweeneyRedHat left review comments

@rhatdan rhatdan rhatdan approved these changes

@edsantiago edsantiago edsantiago approved these changes

@giuseppe giuseppe Awaiting requested review from giuseppe

Assignees
No one assigned
Labels
locked - please file new issue/PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@cevich @rh-atomic-bot @rhatdan @edsantiago @giuseppe @TomSweeneyRedHat