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 broken condition introduced by #1213 #1214

Merged
merged 1 commit into from Sep 26, 2019

Conversation

foursixnine
Copy link
Member

@foursixnine foursixnine commented Sep 25, 2019

FiBackend should only die when all of the attempts have finished and still
the command is not successful.

This should solve the broken xen and zkvm jobs :)

Tested defining manually the domain using the same resource image, and triggering the jobs.

if ($stderr =~ /lock/i) {
die "Too many attempts to format HDD" unless (--$bucket);
Copy link
Contributor

Choose a reason for hiding this comment

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

sorry but Pre-increment operator in negated post-if operator is a bit too much obfusciation for me.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed :)

Copy link
Contributor

Choose a reason for hiding this comment

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

I personally liked it (except for the useless brackets).

@coolo
Copy link
Contributor

coolo commented Sep 26, 2019

verification run?

@foursixnine
Copy link
Member Author

verification run?

See the description

@foursixnine foursixnine force-pushed the oopsibrokeitagain branch 2 times, most recently from 250cdbc to 5822119 Compare September 26, 2019 07:43
if ($stderr =~ /lock/i) {
$bucket--;
die "Too many attempts to format HDD" unless ($bucket); #Only die when there are no attempts left
Copy link
Contributor

Choose a reason for hiding this comment

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

that comment is a little too obvious and we don't use () if it's a simple statement

Copy link
Member Author

Choose a reason for hiding this comment

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

@coolo updated

Backend should only die when all of the attempts have finished and still
the command is not successful.
Copy link
Member Author

@foursixnine foursixnine left a comment

Choose a reason for hiding this comment

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

Last verification run: http://phobos.suse.de/tests/1748062

@foursixnine
Copy link
Member Author

Travis failure seems unrelated... <.<

@okurz
Copy link
Member

okurz commented Sep 26, 2019

I agree

@okurz okurz merged commit f49849c into os-autoinst:master Sep 26, 2019
@foursixnine foursixnine deleted the oopsibrokeitagain branch September 26, 2019 08:34
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.

None yet

4 participants