Skip to content

Commit 9d9a2c1

Browse files
MionszMionsz
committed
Temporary check change
Signed-off-by: Milosz Linkiewicz <[email protected]>
1 parent a24dad6 commit 9d9a2c1

File tree

3 files changed

+52
-57
lines changed

3 files changed

+52
-57
lines changed

‎.github/scripts/run_validation_tests.sh‎

Lines changed: 38 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22

33
set +e
44

5-
VALIDATION_TESTS_1="${1:-$VALIDATION_TESTS_1}"
6-
VALIDATION_TESTS_2="${2:-$VALIDATION_TESTS_2}"
7-
PYTEST_ALIAS="${3:-$PYTEST_ALIAS}"
8-
PYTEST_PARAMS="${4:-$PYTEST_PARAMS}"
9-
export TEST_PORT_P="${5:-$TEST_PORT_P}"
10-
export TEST_PORT_R="${6:-$TEST_PORT_R}"
11-
PYTEST_RETRIES="${PYTEST_RETRIES:-3}"
12-
135
# Function to log messages to GitHub Actions
14-
function LOG_GITHUB_SUMMARY() {
15-
echo "$@" >> "$GITHUB_STEP_SUMMARY"
16-
}
17-
18-
function LOG_GITHUB_CONSOLE() {
19-
echo "$@"
6+
log_to_github() {
7+
echo "$1" >> "$GITHUB_STEP_SUMMARY"
208
}
219

2210
# Function to run a test and handle retries
@@ -27,84 +15,83 @@ run_test() {
2715
local pytest_params=$4
2816
local test_port_p=$5
2917
local test_port_r=$6
30-
local PYTEST_START_TIME=""
31-
local PYTEST_END_TIME=""
32-
local PYTEST_DURATION=""
33-
local PYTEST_TASK_STATUS="❌"
34-
local PYTEST_SUFFIX="[Err]"
3518

36-
LOG_GITHUB_CONSOLE "::group::${test}"
37-
PYTEST_START_TIME=$(date '+%s')
38-
# shellcheck disable=SC2086
39-
${pytest_alias} "${test}" ${pytest_params} --nic="${test_port_p},${test_port_r}" --collect-only -q --no-summary
19+
echo "::group::${test}"
20+
local start_time=$(date '+%s')
21+
$pytest_alias "${test}" $pytest_params --nic="${test_port_p},${test_port_r}" --collect-only -q --no-summary
4022

4123
for retry in $(seq 1 "$retries"); do
42-
# shellcheck disable=SC2086
43-
${pytest_alias} "${test}" ${pytest_params} --nic="${test_port_p},${test_port_r}"
24+
$pytest_alias "${test}" $pytest_params --nic="${test_port_p},${test_port_r}"
4425
local result=$?
45-
LOG_GITHUB_CONSOLE "RETRY: ${retry}"
26+
echo "RETRY: ${retry}"
4627
[[ "$result" == "0" ]] && break
4728
done
4829

49-
PYTEST_END_TIME="$(date '+%s')"
50-
PYTEST_DURATION="$((PYTEST_END_TIME - PYTEST_START_TIME))"
30+
local end_time=$(date '+%s')
31+
local duration=$((end_time - start_time))
32+
local status="❌"
33+
local suffix="[Err]"
5134

5235
if [[ "$result" == "0" ]]; then
53-
PYTEST_TASK_STATUS="✅"
54-
PYTEST_SUFFIX="[OK]"
36+
status="✅"
37+
suffix="[OK]"
5538
TESTS_SUCCESS+=("${test}")
5639
else
5740
TESTS_FAIL+=("${test}")
5841
fi
5942

60-
LOG_GITHUB_SUMMARY "| ${PYTEST_TASK_STATUS} | ${test} | $(date --date=@${PYTEST_START_TIME} '+%d%m%y_%H%M%S') | $(date --date="@${PYTEST_END_TIME}" '+%d%m%y_%H%M%S') | ${PYTEST_DURATION}s | ${PYTEST_SUFFIX} |"
61-
LOG_GITHUB_CONSOLE "::endgroup::"
43+
log_to_github "| ${status} | ${test} | $(date --date=@${start_time} '+%d%m%y_%H%M%S') | $(date --date=@${end_time} '+%d%m%y_%H%M%S') | ${duration}s | ${suffix} |"
44+
echo "::endgroup::"
6245
}
6346

6447
# Main script execution
65-
LOG_GITHUB_CONSOLE "::group::pre-execution-summary"
48+
echo "::group::pre-execution-summary"
49+
50+
# Export environment variables
51+
export TEST_PORT_P="${TEST_PORT_P}"
52+
export TEST_PORT_R="${TEST_PORT_R}"
6653

6754
# Collect tests to be executed
6855
TESTS_INCLUDED_IN_EXECUTION=(
69-
$(grep -v "collected in" <(${PYTEST_ALIAS} "tests/${VALIDATION_TESTS_1}" --collect-only -q --no-summary 2>&1))
56+
$(grep -v "collected in" <($PYTEST_ALIAS "tests/${VALIDATION_TESTS_1}" $PYTEST_PARAMS --nic="${TEST_PORT_P},${TEST_PORT_R}" --collect-only -q --no-summary 2>&1))
7057
)
7158
SUMMARY_MAIN_HEADER="Starting tests/${VALIDATION_TESTS_1}"
7259

7360
if [[ -n "${VALIDATION_TESTS_2}" ]]; then
7461
TESTS_INCLUDED_IN_EXECUTION+=(
75-
$(grep -v "collected in" <(${PYTEST_ALIAS} "tests/${VALIDATION_TESTS_2}" --collect-only -q --no-summary 2>&1))
62+
$(grep -v "collected in" <($PYTEST_ALIAS "tests/${VALIDATION_TESTS_2}" $PYTEST_PARAMS --nic="${TEST_PORT_P},${TEST_PORT_R}" --collect-only -q --no-summary 2>&1))
7663
)
7764
SUMMARY_MAIN_HEADER="${SUMMARY_MAIN_HEADER}, tests/${VALIDATION_TESTS_2}"
7865
fi
7966

67+
NUMBER_OF_TESTS="${#TESTS_INCLUDED_IN_EXECUTION[@]}"
8068
TESTS_FAIL=()
8169
TESTS_SUCCESS=()
8270

83-
LOG_GITHUB_CONSOLE "${SUMMARY_MAIN_HEADER} tests (total ${NUMBER_OF_TESTS}) :rocket:"
84-
LOG_GITHUB_CONSOLE "----------------------------------"
85-
LOG_GITHUB_CONSOLE "Tests to be executed:"
86-
LOG_GITHUB_CONSOLE "${TESTS_INCLUDED_IN_EXECUTION[@]}"
87-
88-
LOG_GITHUB_SUMMARY "## ${SUMMARY_MAIN_HEADER} tests (total ${NUMBER_OF_TESTS}) :rocket:"
89-
LOG_GITHUB_SUMMARY "| ❌/✅ | Collected Test | Started | Ended | Took (s) | Result |"
90-
LOG_GITHUB_SUMMARY "| --- | --- | --- | --- | --- | --- |"
71+
echo "${SUMMARY_MAIN_HEADER} tests (total ${NUMBER_OF_TESTS}) :rocket:"
72+
echo "----------------------------------"
73+
echo "Tests to be executed:"
74+
echo "${TESTS_INCLUDED_IN_EXECUTION[@]}"
9175

92-
LOG_GITHUB_CONSOLE "::endgroup::"
76+
log_to_github "## ${SUMMARY_MAIN_HEADER} tests (total ${NUMBER_OF_TESTS}) :rocket:"
77+
log_to_github "| ❌/✅ | Collected Test | Started | Ended | Took (s) | Result |"
78+
log_to_github "| --- | --- | --- | --- | --- | --- |"
79+
echo "::endgroup::"
9380

9481
# Execute each test
9582
for test in "${TESTS_INCLUDED_IN_EXECUTION[@]}"; do
96-
run_test "$test" "${PYTEST_RETRIES}" "${PYTEST_ALIAS}" "${PYTEST_PARAMS}" "${TEST_PORT_P}" "${TEST_PORT_R}"
83+
run_test "$test" "$PYTEST_RETRIES" "$PYTEST_ALIAS" "$PYTEST_PARAMS" "$TEST_PORT_P" "$TEST_PORT_R"
9784
done
9885

9986
# Summary of test results
100-
LOG_GITHUB_SUMMARY "### Total success ${#TESTS_SUCCESS[@]}/${NUMBER_OF_TESTS}:"
101-
LOG_GITHUB_SUMMARY "${TESTS_SUCCESS[@]}"
102-
LOG_GITHUB_SUMMARY "### Total failed ${#TESTS_FAIL[@]}/${NUMBER_OF_TESTS}:"
103-
LOG_GITHUB_SUMMARY "${TESTS_FAIL[@]}"
87+
log_to_github "### Total success ${#TESTS_SUCCESS[@]}/${NUMBER_OF_TESTS}:"
88+
log_to_github "${TESTS_SUCCESS[@]}"
89+
log_to_github "### Total failed ${#TESTS_FAIL[@]}/${NUMBER_OF_TESTS}:"
90+
log_to_github "${TESTS_FAIL[@]}"
10491

10592
# Determine exit status
10693
if [[ "${#TESTS_FAIL[@]}" == "0" ]] || [[ "${VALIDATION_NO_FAIL_TESTS}" == "true" ]]; then
10794
exit 0
95+
else
96+
exit 1
10897
fi
109-
110-
exit 1

‎.github/workflows/gtest-bare-metal.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env:
2727
# Customize the env if
2828
BUILD_TYPE: 'Release'
2929
DPDK_VERSION: '23.11'
30+
DPDK_REBUILD: 'false'
3031
# Bellow ENV variables are required to be defined on runner side:
3132
# TEST_PF_PORT_P: '0000:49:00.0'
3233
# TEST_PF_PORT_R: '0000:49:00.1'
@@ -71,6 +72,7 @@ jobs:
7172
ref: '${{ inputs.branch-to-checkout || github.head_ref || github.ref }}'
7273

7374
- name: Checkout DPDK
75+
if: env.DPDK_REBUILD == 'true'
7476
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7577
with:
7678
repository: 'DPDK/dpdk'
@@ -83,10 +85,12 @@ jobs:
8385
sudo apt-get install -y systemtap-sdt-dev
8486
8587
- name: Apply dpdk patches
88+
if: env.DPDK_REBUILD == 'true'
8689
run: |
8790
patch -d "dpdk" -p1 -i <(cat patches/dpdk/${{ env.DPDK_VERSION }}/*.patch)
8891
8992
- name: Build dpdk
93+
if: env.DPDK_REBUILD == 'true'
9094
run: |
9195
cd dpdk
9296
meson build
@@ -119,8 +123,8 @@ jobs:
119123
- name: Binding network adapter
120124
run: |
121125
sudo ./script/nicctl.sh create_vf "${TEST_PF_PORT_P}" || true
122-
sudo ./dpdk/usertools/dpdk-devbind.py -b vfio-pci "${TEST_DMA_PORT_P}" || true
123-
sudo ./dpdk/usertools/dpdk-devbind.py -b vfio-pci "${TEST_DMA_PORT_R}" || true
126+
sudo dpdk-devbind.py -b vfio-pci "${TEST_DMA_PORT_P}" || true
127+
sudo dpdk-devbind.py -b vfio-pci "${TEST_DMA_PORT_R}" || true
124128
125129
- name: Start MtlManager at background
126130
run: |

‎.github/workflows/validation-tests.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ on:
111111
env:
112112
BUILD_TYPE: 'Release'
113113
DPDK_VERSION: '23.11'
114+
DPDK_REBUILD: 'false'
114115

115116
permissions:
116117
contents: read
@@ -140,6 +141,7 @@ jobs:
140141

141142
- name: 'preparation: Checkout DPDK'
142143
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
144+
if: env.DPDK_REBUILD == 'true'
143145
with:
144146
repository: 'DPDK/dpdk'
145147
ref: 'v${{ env.DPDK_VERSION }}'
@@ -163,14 +165,18 @@ jobs:
163165
libsdl2-dev \
164166
libsdl2-ttf-dev \
165167
libssl-dev \
166-
systemtap-sdt-dev
168+
systemtap-sdt-dev \
169+
libbpf-dev \
170+
libelf1
167171
168172
- name: 'configuration: Apply dpdk patches'
173+
if: env.DPDK_REBUILD == 'true'
169174
run: |
170175
patch -d "dpdk" -p1 -i <(cat patches/dpdk/${{ env.DPDK_VERSION }}/*.patch)
171176
172177
- name: 'installation: Build dpdk'
173178
working-directory: dpdk
179+
if: env.DPDK_REBUILD == 'true'
174180
run: |
175181
meson build
176182
ninja -C build
@@ -231,7 +237,6 @@ jobs:
231237
sudo rmmod irdma || true
232238
sudo ./script/nicctl.sh ${{ inputs.validation-iface-binding }} "${TEST_PF_PORT_P}" || true
233239
sudo ./script/nicctl.sh ${{ inputs.validation-iface-binding }} "${TEST_PF_PORT_R}" || true
234-
sudo modprobe irdma || true
235240
236241
- name: 'preparation: Start MtlManager at background'
237242
run: |
@@ -240,7 +245,7 @@ jobs:
240245
- name: 'execution: Run validation-bare-metal tests in pipenv environment'
241246
working-directory: tests/validation
242247
run: |
243-
"${{ github.workspace }}/.github/scripts/run_validation_tests.sh"
248+
. "${{ github.workspace }}/.github/scripts/run_validation_tests.sh"
244249
env:
245250
TEST_PORT_P: ${{ env.TEST_PORT_P }}
246251
TEST_PORT_R: ${{ env.TEST_PORT_R }}
@@ -294,7 +299,6 @@ jobs:
294299
sudo rmmod irdma || true
295300
sudo ./script/nicctl.sh bind_kernel "${TEST_PF_PORT_P}" || true
296301
sudo ./script/nicctl.sh bind_kernel "${TEST_PF_PORT_R}" || true
297-
sudo modprobe irdma || true
298302
299303
- name: 'cleanup: Validation execution logs'
300304
if: always()

0 commit comments

Comments
 (0)