-
Notifications
You must be signed in to change notification settings - Fork 197
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
Conversation
This is another way to partially address coreos#740 We should also likely have a `fedora/25/atomic/testing` image.
There was a problem hiding this 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.
tests/vmcheck/overlay.sh
Outdated
@@ -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 ✀✀✀ |
There was a problem hiding this comment.
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 && |
There was a problem hiding this comment.
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.
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.
1ddace9
to
ad5ce6c
Compare
Reworked for comments and updated to 2017.5 ⬆️ |
Grrr sorry, notification emails are not going through for some reason. |
☀️ Test successful - status-atomicjenkins |
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 😢 )