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

ostree: Drop #9784

Merged
merged 1 commit into from Aug 4, 2018
Merged

ostree: Drop #9784

merged 1 commit into from Aug 4, 2018

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Aug 2, 2018

This moved into a separate project:
https://github.com/cockpit-project/cockpit-ostree


As the standalone cockpit-ostree 175-1 is in Fedora rawhide now, the next release of Cockpit should not ship that any more, to avoid version conflicts and duplicate builds. I will also upload the standalone one to Fedora 28 as soon as the dist-git branch is created.

@martinpitt martinpitt added the release-blocker Targetted for next release label Aug 2, 2018
@martinpitt
Copy link
Member Author

Priority as this at least needs to be considered for the next release, depending on the fedora 28 progress.

@martinpitt
Copy link
Member Author

fedora 28 dist-git branch now exists, package built and submitted to bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2018-0effffd2d7

@martinpitt
Copy link
Member Author

martinpitt commented Aug 2, 2018

Semapore fails with

FAIL: tools/test-static-code 2 pyflakes test

I cannot reproduce that locally, there it works for me. But I think this is during distcheck, so apparently still something wonky there.

Update: make distcheck works for me locally, so need to test this in a cockpit/tests container.

@martinpitt
Copy link
Member Author

I cannot reproduce this in a container either, also not locally with a separate build tree:

$ mkdir build; cd build
$ ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-debug
$ srcdir=.. ../tools/test-static-code

This works fine. But I still have trouble to see in the log what actually failed, as there's no actual output from pyflakes, and this PR doesn't touch this part at all. The only error message that I see is

test/avocado/testvm.py: No such file or directory

and indeed I don't see that in other semaphore runs. This smells like a weird race condition which has been there for a long time?

@martinpitt
Copy link
Member Author

I have an idea what's going on. test/avocado/testvm.py is a dangling symlink in the release tarballs, as they point to ../bots/ which we don't ship (by intent). So the question is rather, how can test-static-code and pyflakes sometimes do work in distcheck -- either it should always fail on the dangling symlink, or never.

@martinpitt
Copy link
Member Author

Oooooh, I know! Running pyflakes without the grep -Ev filter shows:

$ pyflakes3 test/ test/verify/check-* 2>&1|grep testvm
test/verify/check-storage-used:23: 'from storagelib import *' used; unable to detect undefined namestest/avocado/testvm.py: No such file or directory

So that error message just sometimes gets hidden because it interleaves with the pyflakes errors. But sometimes, if it is on a different line, we catch it.

@martinpitt
Copy link
Member Author

I sent PR #9789 to fix the flaky semaphore test, marking blocked as this needs to land after that to quiesce semaphore.

@martinpitt martinpitt closed this Aug 3, 2018
@martinpitt martinpitt reopened this Aug 3, 2018
@martinpitt martinpitt removed the blocked label Aug 3, 2018
Copy link
Contributor

@croissanne croissanne left a comment

Choose a reason for hiding this comment

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

This looks good (and satisfying).

One question though: I grepped through the commit and there's a bunch of references to the ostree package in the po files. Will these get removed or are the po files just identical across all cockpit-independent?

@martinpitt
Copy link
Member Author

@Gundersanne: Indeed these are cruft now, but the next bot po-refresh will clean them up. I already imported the translations into cockpit-ostree, so they aren't lost either.

@martinpitt martinpitt merged commit 0462364 into cockpit-project:master Aug 4, 2018
@martinpitt martinpitt deleted the drop-ostree branch August 4, 2018 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-blocker Targetted for next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants