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

Fix CI tests #1892

Closed
wants to merge 6 commits into from
Closed

Fix CI tests #1892

wants to merge 6 commits into from

Conversation

dbnicholson
Copy link
Member

@dbnicholson dbnicholson commented Jul 26, 2019

Some of the CI tests are always failing, which makes it hard to know if your PR is adding new failures.

@dbnicholson dbnicholson force-pushed the fix-ci branch 2 times, most recently from c9e2317 to 82784ef Compare July 26, 2019 17:01
This wasn't available when I originally wrote this, but it ensures that
the running gpg-agent in tmpgpghome is killed in case the tests exit
early.
The ability to expire subkeys using gpg's --quick-set-expire is only
available on gnupg 2.1.22. If expiring a subkey fails, assume this is
why and skip the tests that require it but run the actions that the
subsequent tests depend on. This was failing on the Debian Stretch CI
tests since stretch has gnupg 2.1.18.
Move the OstreeKernelArgs autoptr cleanup definition to
ostree-autocleanups.h, which will only expose the definitions when
building ostree or if glib is new enough. The include of
ostree-kernel-args.h needs to be moved before ostree-autocleanups.h in
ostree.h so that the OstreeKernelArgs type is declared when the autoptr
cleanup is defined. All the places it's used already pull in libglnx.h
first so that the compat macros are picked up if glib it too old during
the ostree build.
@dbnicholson
Copy link
Member Author

I did what I could but I don't believe I can fix the f29-rpmostree failure. As far as I can tell that's fixed by coreos/rpm-ostree@45b6186, but that's only in rpm-ostree 2019.3 and the f29 test is running rpm-ostree 2019.1. I don't know how to make it run something newer.

Anyways, this is ready for review.

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.

Just one comment, otherwise looks good to me!

I did what I could but I don't believe I can fix the f29-rpmostree failure.

It should work to just bump RPMOSTREE_TAG to v2019.3, but feel free to leave that one alone for now.

tests/test-gpg-signed-commit.sh Outdated Show resolved Hide resolved
@dbnicholson
Copy link
Member Author

Just one comment, otherwise looks good to me!

I did what I could but I don't believe I can fix the f29-rpmostree failure.

It should work to just bump RPMOSTREE_TAG to v2019.3, but feel free to leave that one alone for now.

I'll give it a shot.

The test-ucontainer.sh test in rpmostree 2019.1 is failing for
non-ostree reasons. This is fixed in [1], which is part of 2019.3. I
believe this is still a relevant test of f29 since that's what's shipped
in f29-updates.

1. coreos/rpm-ostree@45b6186
@dbnicholson
Copy link
Member Author

All tests passing now. I forget, does homu take care of squashing my fixups or should I rewrite the history myself?

@cgwalters
Copy link
Member

Homu will squash. Thanks so much for doing this! I owe you 🍻

@rh-atomic-bot + d4baf60

@dbnicholson
Copy link
Member Author

Homu will squash. Thanks so much for doing this! I owe you

Well, one of them I introduced myself, so 😛

@dbnicholson
Copy link
Member Author

@cgwalters it doesn't look like the merge was initiated.

@jlebon
Copy link
Member

jlebon commented Jul 27, 2019

All green, beautiful!

@cgwalters it doesn't look like the merge was initiated.

Ahh yup, we're missing an r.
@rh-atomic-bot r+ d4baf60

@rh-atomic-bot
Copy link

⚡ Test exempted: merge already tested.

rh-atomic-bot pushed a commit that referenced this pull request Jul 27, 2019
The ability to expire subkeys using gpg's --quick-set-expire is only
available on gnupg 2.1.22. If expiring a subkey fails, assume this is
why and skip the tests that require it but run the actions that the
subsequent tests depend on. This was failing on the Debian Stretch CI
tests since stretch has gnupg 2.1.18.

Closes: #1892
Approved by: jlebon
rh-atomic-bot pushed a commit that referenced this pull request Jul 27, 2019
Move the OstreeKernelArgs autoptr cleanup definition to
ostree-autocleanups.h, which will only expose the definitions when
building ostree or if glib is new enough. The include of
ostree-kernel-args.h needs to be moved before ostree-autocleanups.h in
ostree.h so that the OstreeKernelArgs type is declared when the autoptr
cleanup is defined. All the places it's used already pull in libglnx.h
first so that the compat macros are picked up if glib it too old during
the ostree build.

Closes: #1892
Approved by: jlebon
rh-atomic-bot pushed a commit that referenced this pull request Jul 27, 2019
The test-ucontainer.sh test in rpmostree 2019.1 is failing for
non-ostree reasons. This is fixed in [1], which is part of 2019.3. I
believe this is still a relevant test of f29 since that's what's shipped
in f29-updates.

1. coreos/rpm-ostree@45b6186

Closes: #1892
Approved by: jlebon
d4s pushed a commit to d4s/ostree that referenced this pull request Nov 4, 2019
This wasn't available when I originally wrote this, but it ensures that
the running gpg-agent in tmpgpghome is killed in case the tests exit
early.

Closes: ostreedev#1892
Approved by: jlebon
d4s pushed a commit to d4s/ostree that referenced this pull request Nov 4, 2019
The ability to expire subkeys using gpg's --quick-set-expire is only
available on gnupg 2.1.22. If expiring a subkey fails, assume this is
why and skip the tests that require it but run the actions that the
subsequent tests depend on. This was failing on the Debian Stretch CI
tests since stretch has gnupg 2.1.18.

Closes: ostreedev#1892
Approved by: jlebon
d4s pushed a commit to d4s/ostree that referenced this pull request Nov 4, 2019
Move the OstreeKernelArgs autoptr cleanup definition to
ostree-autocleanups.h, which will only expose the definitions when
building ostree or if glib is new enough. The include of
ostree-kernel-args.h needs to be moved before ostree-autocleanups.h in
ostree.h so that the OstreeKernelArgs type is declared when the autoptr
cleanup is defined. All the places it's used already pull in libglnx.h
first so that the compat macros are picked up if glib it too old during
the ostree build.

Closes: ostreedev#1892
Approved by: jlebon
d4s pushed a commit to d4s/ostree that referenced this pull request Nov 4, 2019
The test-ucontainer.sh test in rpmostree 2019.1 is failing for
non-ostree reasons. This is fixed in [1], which is part of 2019.3. I
believe this is still a relevant test of f29 since that's what's shipped
in f29-updates.

1. coreos/rpm-ostree@45b6186

Closes: ostreedev#1892
Approved by: jlebon
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.

4 participants