From 546f14032a3bfe3980b0688132fa6df49b2c14e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Obih=C3=B6rnchen?= Date: Sat, 10 Feb 2024 19:25:24 +0100 Subject: [PATCH 1/4] Fix node16 deprecation warning --- .github/workflows/xcat_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml index 4f432e5f6d..1de9e6c939 100644 --- a/.github/workflows/xcat_test.yml +++ b/.github/workflows/xcat_test.yml @@ -4,6 +4,6 @@ jobs: xcat_pr_test: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - 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 From 7fc363b99ecbccac301af95f25ea70e505f31933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Obih=C3=B6rnchen?= Date: Sat, 10 Feb 2024 20:49:22 +0100 Subject: [PATCH 2/4] Add a 60 min default timeout to xcat_test Looks like this actions hangs from time to time. Let's use a reasonable default to get faster failing messages. --- .github/workflows/xcat_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml index 1de9e6c939..c8a783f3c0 100644 --- a/.github/workflows/xcat_test.yml +++ b/.github/workflows/xcat_test.yml @@ -3,6 +3,7 @@ on: [pull_request, workflow_dispatch] jobs: xcat_pr_test: runs-on: ubuntu-20.04 + timeout-minutes: 60 steps: - uses: actions/checkout@v4 - 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 From 32c4a9cfbe78ff4f6b8896cc65cfa57a9a8bf6f4 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Sun, 11 Feb 2024 22:16:17 +0100 Subject: [PATCH 3/4] Remove redundant makedhcp_n_linux test case from CI pipeline makedhcp_n_linux is the same as makedhcp_n. It doesn't make sense to run both test cases. --- xCAT-test/autotest/testcase/makedhcp/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 93cab1e36604a20f0ef956dcac268e87b4752815 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Sun, 11 Feb 2024 23:03:41 +0100 Subject: [PATCH 4/4] Add step names --- .github/workflows/xcat_test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/xcat_test.yml b/.github/workflows/xcat_test.yml index c8a783f3c0..f7bf5a1f6a 100644 --- a/.github/workflows/xcat_test.yml +++ b/.github/workflows/xcat_test.yml @@ -6,5 +6,7 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - 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 + - 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