diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml index 4f432e5f6d..f7bf5a1f6a 100644 --- a/.github/workflows/xcat_test.yml +++ b/.github/workflows/xcat_test.yml @@ -3,7 +3,10 @@ on: [pull_request, workflow_dispatch] jobs: xcat_pr_test: runs-on: ubuntu-20.04 + timeout-minutes: 60 steps: - - uses: actions/checkout@v3 - - run: sudo apt-get install -y fakeroot reprepro devscripts debhelper libcapture-tiny-perl libjson-perl libsoap-lite-perl libdbi-perl libcgi-pm-perl quilt openssh-server dpkg looptools genometools software-properties-common - - run: perl github_action_xcat_test.pl + - uses: actions/checkout@v4 + - name: Install dependencies + run: sudo apt-get install -y fakeroot reprepro devscripts debhelper libcapture-tiny-perl libjson-perl libsoap-lite-perl libdbi-perl libcgi-pm-perl quilt openssh-server dpkg looptools genometools software-properties-common + - name: Run tests + run: perl github_action_xcat_test.pl diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0 index 2e4661a85d..9566ab1a54 100644 --- a/xCAT-test/autotest/testcase/makedhcp/cases0 +++ b/xCAT-test/autotest/testcase/makedhcp/cases0 @@ -34,7 +34,7 @@ end start:makedhcp_n_linux description:Create a new dhcp configuration file with a network statement for each network the dhcp daemon should listen on -label:others,ci_test +label:others os:Linux cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then cp -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then cp -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi cmd:makedhcp -n