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.

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

Require ostree 2017.5 📆 #740

Closed
wants to merge 1 commit into from

Conversation

cgwalters
Copy link
Member

@cgwalters cgwalters commented Apr 14, 2017

This is preparatory for future changes which will make use the newer sysroot
writing API. But in this change, we can drop all of our version ifdef'd code.

(Breaking this out of since it's harder than I thought #709 - in fact astonishing levels of pain 😢 )

cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request Apr 14, 2017
This is another way to partially address
coreos#740
We should also likely have a `fedora/25/atomic/testing` image.
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Might as well wait for the imminent ostree build with the fix for ostreedev/ostree#799.

@@ -58,7 +58,17 @@ rm vmcheck -rf
ostree checkout $commit vmcheck --fsync=0
# ✀✀✀ BEGIN hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀
rm -f vmcheck/usr/etc/{.pwd.lock,passwd-,group-,shadow-,gshadow-,subuid-,subgid-}
# ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀
# ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/642 ✀✀✀
Copy link
Member

Choose a reason for hiding this comment

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

This should still point at #693, right?

.redhat-ci.yml Outdated
@@ -101,6 +108,7 @@ tests:
- >
docker run --privileged -v $(pwd):/srv/code --rm
projectatomic/rpm-ostree-tester /bin/sh -c "
yum -y install https://kojipkgs.fedoraproject.org//packages/ostree/2017.4/2.fc25/x86_64/ostree-2017.4-2.fc25.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/ostree/2017.4/2.fc25/x86_64/ostree-devel-2017.4-2.fc25.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/ostree/2017.4/2.fc25/x86_64/ostree-libs-2017.4-2.fc25.x86_64.rpm &&
Copy link
Member

Choose a reason for hiding this comment

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

You should be able to split this on multiple lines to make it more legible, even with indentation if you'd like.

rh-atomic-bot pushed a commit that referenced this pull request Apr 19, 2017
This is another way to partially address
#740
We should also likely have a `fedora/25/atomic/testing` image.

Closes: #742
Approved by: jlebon
This is preparatory for future changes which will make use the newer sysroot
writing API. But in this change, we can drop all of our version ifdef'd code.
@cgwalters cgwalters force-pushed the require-ostree-2017.4 branch from 1ddace9 to ad5ce6c Compare April 19, 2017 14:07
@cgwalters
Copy link
Member Author

Reworked for comments and updated to 2017.5 ⬆️

@cgwalters cgwalters changed the title Require ostree 2017.4 Require ostree 2017.5 📆 Apr 19, 2017
@jlebon
Copy link
Member

jlebon commented Apr 20, 2017

Grrr sorry, notification emails are not going through for some reason.
@rh-atomic-bot r+ ad5ce6c

@rh-atomic-bot
Copy link

⌛ Testing commit ad5ce6c with merge 9ab46f5...

@rh-atomic-bot
Copy link

☀️ Test successful - status-atomicjenkins
Approved by: jlebon
Pushing 9ab46f5 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants