From a716e8ff9047cfe323980d789a44f6972b802e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:47:42 -0300
Subject: [PATCH] Fix DHCP CI package layout

---
 github_action_xcat_test.pl              | 2 +-
 xCAT-test/unit/dhcp_kea_plugin_intent.t | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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;