lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Include the project and jobset names in the configuration blocks

Browse source 
to set the timeout for a specific input in the GitInput plugin.

Remove the comments about using inputs with spaces.
This commit is contained in:
Joel Rivera 2017-04-28 21:43:35 -05:00
parent af2f8122e3
commit a39ffba042
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/lib/Hydra/Plugin/GitInput.pm
View file

@ -49,7 +49,7 @@ sub _printIfDebug {
print STDERR "GitInput: $msg" if $ENV{'HYDRA_DEBUG'}; print STDERR "GitInput: $msg" if $ENV{'HYDRA_DEBUG'};
} }
=item _pluginConfig($main_config, $input_name) =item _pluginConfig($main_config, $project_name, $jobset_name, $input_name)
Read the configuration from the main hydra config file. Read the configuration from the main hydra config file.
@ -62,58 +62,60 @@ the ones on the configuration file, to define the variables
as an input value use: <name>=<value> without spaces and as an input value use: <name>=<value> without spaces and
specify at least he repo url and branch. specify at least he repo url and branch.
<git-input> Expected configuration format in the hydra config file:
# general timeout <git-input>
timeout = 400 # general timeout
<input-name> timeout = 400
# specific timeout for a particular input name
timeout = 400
</input-name>
# use quotes when the input name has spaces <project:jobset:input-name>
<"foot with spaces"> # specific timeout for a particular input
# specific timeout for a particular input name timeout = 400
timeout = 400 </project:jobset:input-name>
</"foo with spaces">
</git-input> </git-input>
=cut =cut
sub _pluginConfig { sub _pluginConfig {
my ($main_config, $input_name) = @_; my ($main_config, $project_name, $jobset_name, $input_name) = @_;
my $cfg = $main_config->{$CONFIG_SECTION}; my $cfg = $main_config->{$CONFIG_SECTION};
# default values # default values
my $values = { my $values = {
timeout => 600, timeout => 600,
}; };
my $input_block = "$project_name:$jobset_name:$input_name";
unless (defined $cfg) { unless (defined $cfg) {
_printIfDebug "Unable to load $CONFIG_SECTION section\n"; _printIfDebug "Unable to load $CONFIG_SECTION section\n";
_printIfDebug "Using default values\n"; _printIfDebug "Using default values\n";
return $values; return $values;
} else { } else {
_printIfDebug "Parsing plugin configuration: "; _printIfDebug "Parsing plugin configuration:\n";
_printIfDebug Dumper($cfg); _printIfDebug Dumper($cfg);
} }
if (defined $cfg->{$input_name} and %{$cfg->{$input_name}}) { if (defined $cfg->{$input_block} and %{$cfg->{$input_block}}) {
_printIfDebug "Merging sections for $input_name\n"; _printIfDebug "Merging sections from $input_block\n";
$cfg = {%{$cfg}, %{$cfg->{$input_name}}}; # merge with precedense to the input name # merge with precedense to the input block
$cfg = {%{$cfg}, %{$cfg->{$input_block}}};
} }
if (exists $cfg->{timeout}) { if (exists $cfg->{timeout}) {
$values->{timeout} = int($cfg->{timeout}); $values->{timeout} = int($cfg->{timeout});
_printIfDebug "Using custom timeout for $input_name:"; _printIfDebug "Using custom timeout for $input_block:\n";
} else { } else {
_printIfDebug "Using default timeout for $input_name:"; _printIfDebug "Using default timeout for $input_block:\n";
} }
_printIfDebug "$values->{timeout}\n"; _printIfDebug "$values->{timeout}\n";
return $values; return $values;
} }
sub fetchInput { sub fetchInput {
my ($self, $type, $name, $value) = @_; my ($self, $type, $name, $value, $project, $jobset) = @_;
return undef if $type ne "git"; return undef if $type ne "git";
my ($uri, $branch, $deepClone, $options) = _parseValue($value); my ($uri, $branch, $deepClone, $options) = _parseValue($value);
my $cfg = _pluginConfig($self->{config}, $name); my $cfg = _pluginConfig($self->{config},
$project->get_column('name'),
$jobset->get_column('name'),
$name);
# give preference to the options from the input value # give preference to the options from the input value
while (my ($opt_name, $opt_value) = each %{$options}) { while (my ($opt_name, $opt_value) = each %{$options}) {
if ($opt_value =~ /\d+/) { if ($opt_value =~ /\d+/) {