mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-05-05 08:39:08 +00:00
Fix DHCP CI package layout
This commit is contained in:
@@ -469,7 +469,7 @@ sub run_fast_regression_test{
|
||||
system "sudo touch $conf_file";
|
||||
system "sudo chmod 777 $conf_file";
|
||||
open(my $fh, '>', $conf_file) or die "Could not open test configuration file $!";
|
||||
print $fh "[System]\nMN=$hostname\n[Table_site]\nkey=domain\nvalue=pok.stglabs.ibm.com\n";
|
||||
print $fh "[System]\nMN=$hostname\n[Table_site]\nkey=domain\nvalue=pok.stglabs.ibm.com\nkey=dhcpbackend\nvalue=isc\n";
|
||||
close($fh);
|
||||
|
||||
print "Dumper regression conf file:\n";
|
||||
|
||||
@@ -47,7 +47,12 @@ BEGIN {
|
||||
$INC{'xCAT/NodeRange.pm'} = __FILE__;
|
||||
}
|
||||
|
||||
require "$FindBin::Bin/../../xCAT-server/lib/xcat/plugins/dhcp.pm";
|
||||
my $source_dhcp_plugin = "$FindBin::Bin/../../xCAT-server/lib/xcat/plugins/dhcp.pm";
|
||||
if ( -f $source_dhcp_plugin ) {
|
||||
require $source_dhcp_plugin;
|
||||
} else {
|
||||
require xCAT_plugin::dhcp;
|
||||
}
|
||||
|
||||
{
|
||||
package DHCPKeaIntentNetTable;
|
||||
|
||||
Reference in New Issue
Block a user