]> xenbits.xensource.com Git - osstest.git/commitdiff
projects / osstest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5951a9)
cs-bisection-step: Properly handle external job refs in template flight-61349 flight-61350 flight-61351 flight-61352 flight-61353 flight-61354 flight-61355 flight-61356 flight-61357 flight-61358 flight-61359 flight-61360 flight-61361 flight-61362 flight-61363 flight-61364 flight-61365 flight-61366 flight-61367 flight-61368 flight-61369 flight-61370 flight-61371 flight-61372 flight-61373 flight-61374 flight-61375 flight-61376 flight-61377 flight-61378 flight-61379 flight-61380 flight-61381 flight-61382 flight-61383 flight-61384 flight-61385 flight-61386 flight-61387 flight-61388 flight-61389 flight-61390 flight-61391 flight-61392 flight-61393 flight-61394 flight-61395 flight-61396 flight-61397 flight-61398 flight-61399 flight-61400 flight-61401 flight-61402 flight-61403 flight-61404 flight-61405 flight-61406 flight-61407 flight-61408 flight-61409 flight-61410 flight-61411 flight-61412 flight-61413 flight-61414 flight-61415 flight-61416 flight-61417 flight-61418 flight-61419 flight-61420 flight-61421 flight-61422 flight-61423 flight-61424 flight-61425 flight-61426 flight-61427 flight-61428 flight-61429 flight-61430 flight-61431 flight-61432 flight-61433 flight-61434 flight-61435 flight-61436 flight-61437 flight-61438 flight-61439 flight-61440 flight-61441 flight-61442 flight-61443 flight-61444 flight-61445 flight-61446 flight-61447 flight-61448 flight-61449 flight-61450 flight-61452 flight-61453 flight-61454 flight-61455 flight-61456 flight-61457 flight-61458 flight-61459 flight-61460 flight-61461 flight-61462 flight-61463 flight-61464 flight-61465 flight-61466 flight-61467 flight-61468 flight-61470 flight-61471 flight-61472 flight-61473 flight-61474 flight-61475 flight-61476 flight-61477 flight-61478 flight-61479 flight-61480 flight-61481 flight-61482 flight-61483 flight-61484 flight-61485 flight-61486 flight-61487 flight-61488 flight-61490 flight-61491 flight-61492 flight-61493 flight-61494 flight-61495 flight-61496 flight-61497 flight-61498 flight-61499 flight-61500 flight-61501 flight-61503 flight-61504 flight-61505 flight-61506 flight-61507 flight-61508 flight-61509 flight-61511 flight-61512 flight-61513 flight-61514 flight-61515 flight-61516 flight-61517 flight-61518 flight-61519 flight-61520 flight-61521 flight-61522 flight-61523 flight-61524 flight-61525 flight-61526 flight-61527 flight-61528 flight-61529 flight-61530 flight-61531 flight-61532 flight-61533 flight-61534 flight-61535 flight-61536 flight-61537 flight-61538 flight-61539 flight-61540 flight-61541 flight-61542 flight-61543 flight-61544 flight-61545 flight-61546 flight-61547 flight-61548 flight-61549 flight-61550 flight-61551 flight-61553 flight-61555 flight-61556 flight-61559 flight-61561 flight-61562 flight-61563 flight-61565 flight-61566 flight-61567 flight-61569 flight-61571 flight-61572 flight-61573 flight-61576 flight-61578 flight-61580 flight-61581 flight-61583 flight-61584 flight-61588 flight-61589 flight-61590 flight-61591 flight-61592 flight-61593 flight-61594 flight-61597 flight-61598 flight-61599 flight-61600 flight-61603 flight-61604 flight-61605 flight-61606 flight-61607 flight-61608 flight-61609 flight-61610 flight-61611 flight-61612 flight-61614 flight-61615 flight-61616 flight-61617 flight-61618 flight-61619 flight-61620 flight-61621 flight-61622 flight-61623 flight-61624 flight-61625 flight-61626 flight-61627 flight-61628 flight-61629 flight-61630 flight-61631 flight-61632 flight-61633 flight-61634 flight-61635 flight-61636 flight-61637 flight-61638 flight-61639 flight-61640 flight-61641 flight-61642 flight-61643 flight-61644 flight-61645 flight-61646 flight-61647 flight-61648 flight-61649 flight-61650 flight-61651 flight-61652 flight-61653 flight-61654 flight-61655 flight-61656 flight-61657 flight-61658 flight-61660 flight-61661 flight-61662 flight-61663 flight-61666 flight-61671 flight-61674 flight-61675 flight-61677 flight-61682 flight-61684 flight-61685 flight-61686 flight-61687 flight-61688 flight-61689 flight-61690 flight-61691 flight-61692 flight-61693 flight-61694 flight-61695 flight-61696 flight-61697 flight-61701 flight-61702 flight-61704 flight-61705
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 4 Sep 2015 10:46:37 +0000 (11:46 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 4 Sep 2015 11:08:18 +0000 (12:08 +0100)
cs-bisection-step has had, for a long time, code which is supposed to
handle the situation where the template flight contains build job
references to other flights.

However:

 - The regexp to spot these other-flight job reference runvars would
   never match because it said \s where \S was probably intended (and
   . would be better);

 - If it were to match, the flight and job arguments to the recursive
   preparejob invocation were the wrong way round.  preparejob takes
   the job name first.

Fix these two bugs.  Now it does seem to work properly.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
cs-bisection-step patch | blob | blame | history

diff --git a/cs-bisection-step b/cs-bisection-step
index 37efbeac6c020913c36fbf96007788aaf70bec52..b6760446aa43b0149189b39a547a948621edde01 100755 (executable)
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -1190,8 +1190,8 @@ END
     foreach my $subjob (@$subjobs) {
         my $target;
         my $jobspec= $subjob->{val};
-        if ($jobspec =~ m/^(\d+)\.(\s+)$/) {
-            $target= preparejob($1, $2, 1);
+        if ($jobspec =~ m/^(\d+)\.(.+)$/) {
+            $target= preparejob($2, $1, 1);
         } else {
             $target= preparejob($jobspec, $copyflight, 1);
         }
Xen Test Framework and Suite, used for Open Source Xen CI push gate