Skip to content

Commit 07fbfa7

Browse files
committed
ci(gha/workflows): add parallel test execution to HST workflow
- also, clean up verify job timeouts Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
1 parent 2daa21b commit 07fbfa7

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

.github/actions/vpp-hst-test/action.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ inputs:
1616
description: "Directory containing HostStack Test (HST) framework tests"
1717
required: true
1818
type: string
19+
TEST_JOBS:
20+
description: "Number of parallel jobs for HST tests"
21+
required: true
22+
type: string
1923
TUI_LINE:
2024
description: "Delimiter line for TUI output"
2125
required: false
@@ -31,6 +35,7 @@ runs:
3135
WORKSPACE: ${{ inputs.WORKSPACE }}
3236
BUILD_TYPE: ${{ inputs.BUILD_TYPE }}
3337
HS_TEST_DIR: ${{ inputs.HS_TEST_DIR }}
38+
TEST_JOBS: ${{ inputs.TEST_JOBS }}
3439
TUI_LINE: ${{ inputs.TUI_LINE }}
3540
run: |
3641
set -euxo pipefail
@@ -41,23 +46,23 @@ runs:
4146
RETVAL="0"
4247
4348
hst_debug_build_run() {
44-
if ! make VERBOSE=true VPPSRC="$WORKSPACE" -C "$HS_TEST_DIR" build-debug ; then
45-
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE -C $HS_TEST_DIR build-debug'"
49+
if ! make VERBOSE=true VPPSRC="$WORKSPACE" PARALLEL="${TEST_JOBS}" -C "$HS_TEST_DIR" build-debug ; then
50+
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE PARALLEL="${TEST_JOBS}" -C $HS_TEST_DIR build-debug'"
4651
return
4752
fi
48-
if ! make VERBOSE=true VPPSRC="$WORKSPACE" -C "$HS_TEST_DIR" test-debug ; then
49-
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE -C $HS_TEST_DIR test-debug'"
53+
if ! make VERBOSE=true VPPSRC="$WORKSPACE" PARALLEL="${TEST_JOBS}" -C "$HS_TEST_DIR" test-debug ; then
54+
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE PARALLEL="${TEST_JOBS}" -C $HS_TEST_DIR test-debug'"
5055
return
5156
fi
5257
}
5358
5459
hst_build_run() {
55-
if ! make VERBOSE=true VPPSRC="$WORKSPACE" -C "$HS_TEST_DIR" build ; then
56-
BUILD_ERROR="FAILED 'make -C $HS_TEST_DIR build'"
60+
if ! make VERBOSE=true VPPSRC="$WORKSPACE" PARALLEL="${TEST_JOBS}" -C "$HS_TEST_DIR" build ; then
61+
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE PARALLEL="${TEST_JOBS}" -C $HS_TEST_DIR build'"
5762
return
5863
fi
59-
if ! make VERBOSE=true VPPSRC="$WORKSPACE" -C "$HS_TEST_DIR" test ; then
60-
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE -C $HS_TEST_DIR test'"
64+
if ! make VERBOSE=true VPPSRC="$WORKSPACE" PARALLEL="${TEST_JOBS}" -C "$HS_TEST_DIR" test ; then
65+
BUILD_ERROR="FAILED 'make VERBOSE=true VPPSRC=$WORKSPACE PARALLEL="${TEST_JOBS}" -C $HS_TEST_DIR test'"
6166
return
6267
fi
6368
}

.github/workflows/vpp-mrg-mktst.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ jobs:
151151

152152
- name: VPP Make Test
153153
uses: pmikus/vpp/.github/actions/vpp-make-test@master
154-
timeout-minutes: 75
155154
with:
156155
WORKSPACE: ${{ env.WORKSPACE }}
157156
TEST_JOBS: ${{ env.TEST_JOBS }}

.github/workflows/vpp-vfy-dpdk-rdma-ver.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
TUI_LINE: ${{ env.TUI_LINE }}
5858

5959
- name: VPP Make Coverage Test
60+
timeout-minutes: 90
6061
run: |
6162
set -euo pipefail
6263

.github/workflows/vpp-vfy-gcc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
WORKSPACE: ${{ env.WORKSPACE }}
9898
TUI_LINE: ${{ env.TUI_LINE }}
9999

100-
- name: Build VPP
100+
- name: Build VPP with GCC/GCOV
101101
uses: pmikus/vpp/.github/actions/vpp-build@master
102102
with:
103103
WORKSPACE: ${{ env.WORKSPACE }}
@@ -113,9 +113,9 @@ jobs:
113113
SHM_SIZE: ${{ env.SHM_SIZE }}
114114
TUI_LINE: ${{ env.TUI_LINE }}
115115

116-
- name: VPP Make Test
116+
- name: VPP Make Test with GCC/GCOV
117117
uses: pmikus/vpp/.github/actions/vpp-make-test@master
118-
timeout-minutes: 60
118+
timeout-minutes: 90
119119
with:
120120
WORKSPACE: ${{ env.WORKSPACE }}
121121
BUILD_TYPE: ${{ matrix['build_type'] }}

.github/workflows/vpp-vfy-hst.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
HS_TEST_DIR: /scratch/docker-build/vpp/test-c/hs-test
5454
CCACHE_DIR: /scratch/ccache/${{ matrix.os }}-${{ matrix.executor_arch }}
5555
MAKE_PARALLEL_JOBS: 16
56+
TEST_JOBS: 16
5657
GERRIT_BRANCH: ""
5758
GERRIT_CHANGE_URL: ""
5859
GERRIT_PROJECT: ""
@@ -114,11 +115,12 @@ jobs:
114115
- name: HST Test VPP
115116
if: success()
116117
uses: pmikus/vpp/.github/actions/vpp-hst-test@master
117-
timeout-minutes: 60
118+
timeout-minutes: 90
118119
with:
119120
WORKSPACE: ${{ env.WORKSPACE }}
120121
BUILD_TYPE: ${{ matrix['build_type'] }}
121122
HS_TEST_DIR: ${{ env.HS_TEST_DIR }}
123+
TEST_JOBS: ${{ env.TEST_JOBS }}
122124
TUI_LINE: ${{ env.TUI_LINE }}
123125

124126
- name: Report Success

.github/workflows/vpp-vfy-mktst.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: VPP Make Test
121121
uses: pmikus/vpp/.github/actions/vpp-make-test@master
122-
timeout-minutes: 75
122+
timeout-minutes: 90
123123
with:
124124
WORKSPACE: ${{ env.WORKSPACE }}
125125
TEST_JOBS: ${{ env.TEST_JOBS }}

0 commit comments

Comments
 (0)