diff --git a/github_action_xcat_test.pl b/github_action_xcat_test.pl index e0b53e273..74b3f8da8 100644 --- a/github_action_xcat_test.pl +++ b/github_action_xcat_test.pl @@ -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"; diff --git a/xCAT-test/unit/dhcp_kea_plugin_intent.t b/xCAT-test/unit/dhcp_kea_plugin_intent.t index cc4890386..704f56af7 100644 --- a/xCAT-test/unit/dhcp_kea_plugin_intent.t +++ b/xCAT-test/unit/dhcp_kea_plugin_intent.t @@ -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;