scripts/cijobs.pl: detect zuul cmake jobs better

This commit is contained in:
Daniel Stenberg 2022-02-12 16:56:06 +01:00
parent c3331a029c
commit b0d18dbcc0
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2

View File

@ -402,6 +402,7 @@ sub zuul {
my $c = 0; my $c = 0;
my %job; my %job;
my $line=0; my $line=0;
my $type;
$job{'file'} = "zuul.d/jobs.yaml"; $job{'file'} = "zuul.d/jobs.yaml";
$job{'service'} = "zuul"; $job{'service'} = "zuul";
while(<G>) { while(<G>) {
@ -409,6 +410,7 @@ sub zuul {
#print "L: ($jobmode / $env) $_"; #print "L: ($jobmode / $env) $_";
if($_ =~ /^- job:/) { if($_ =~ /^- job:/) {
$jobmode = 1; # start a new $jobmode = 1; # start a new
$type="configure";
} }
if($jobmode) { if($jobmode) {
if($apt) { if($apt) {
@ -433,10 +435,14 @@ sub zuul {
my ($var, $value) = ($1, $2); my ($var, $value) = ($1, $2);
if($var eq "C") { if($var eq "C") {
$var = "configure"; $var = $type;
} }
elsif($var eq "T") { elsif($var eq "T") {
$var = "tests"; $var = "tests";
if($value eq "cmake") {
# otherwise it remains configure
$type = "cmake";
}
} }
elsif($var eq "CC") { elsif($var eq "CC") {
$var = "compiler"; $var = "compiler";