Skip to content

Vmcheck fixes#698

Closed
cgwalters wants to merge 3 commits intocoreos:masterfrom
cgwalters:vmcheck-fixes
Closed

Vmcheck fixes#698
cgwalters wants to merge 3 commits intocoreos:masterfrom
cgwalters:vmcheck-fixes

Conversation

@cgwalters
Copy link
Copy Markdown
Member

There's a hack in here, I don't quite understand the code.

for url in https://kojipkgs.fedoraproject.org//packages/ostree/2017.2/3.fc25/x86_64/ostree-{,libs-,grub2-}2017.2-3.fc25.x86_64.rpm; do
curl -sSL -O $url
done
ver=2017.3
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That also bumped the version from 2017.2 to 2017.3. Was that intentional?

Actually we should be able to dump this hack now. The fedora/25/atomic image has ostree-2017.2-3. (And it's nice, because I always have to cut ✂️ out that chunk on my computer because I use CAHC!).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, though I need the newer version for livefs. Hmm. I'll do something else for that.

rm vmcheck -rf
ostree checkout $commit vmcheck --fsync=0
# https://github.com/projectatomic/rpm-ostree/pull/693
rm -f vmcheck/usr/etc/{.pwd.lock,passwd-,group-,shadow-,gshadow-,subuid-,subgid-}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can we make the comment there a bit more explicit re. the fact that this should be temporary? (Something like the nice ✂️ ✂️ ✂️ below).

j.write(f.read())
os.remove("vmcheck/%s.out" % self.test)
outfile = "vmcheck/{}.out".format(self.test)
if os.path.isfile(outfile):
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Not a hack! I think that makes sense. If test.sh failed even before writing to the log file, opening will fail.

If test.sh failed even before writing to the log file, opening will fail.
Until we land <coreos#693> and it
makes its way into all of our streams.

Necessary for livefs.
The version in the current release has the fix.
@cgwalters
Copy link
Copy Markdown
Member Author

Ok, reworked 🔧

@jlebon
Copy link
Copy Markdown
Member

jlebon commented Mar 22, 2017

@rh-atomic-bot r+ 7cfadc5

@rh-atomic-bot
Copy link
Copy Markdown

⌛ Testing commit 7cfadc5 with merge 1c42102...

rh-atomic-bot pushed a commit that referenced this pull request Mar 22, 2017
Until we land <#693> and it
makes its way into all of our streams.

Necessary for livefs.

Closes: #698
Approved by: jlebon
rh-atomic-bot pushed a commit that referenced this pull request Mar 22, 2017
The version in the current release has the fix.

Closes: #698
Approved by: jlebon
@rh-atomic-bot
Copy link
Copy Markdown

☀️ Test successful - status-atomicjenkins
Approved by: jlebon
Pushing 1c42102 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants