Skip to content

Commit

Permalink
Merge ODP v1.42.1.0
Browse files Browse the repository at this point in the history
Merge ODP linux-generic v1.42.1.0 into linux-dpdk.
  • Loading branch information
MatiasElo authored Nov 6, 2023
2 parents 77d57e6 + b99536f commit 8c8f3e2
Show file tree
Hide file tree
Showing 729 changed files with 10,440 additions and 5,329 deletions.
1 change: 0 additions & 1 deletion .checkpatch.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
--ignore=VOLATILE
--ignore=AVOID_EXTERNS
--ignore=CONST_STRUCT
--ignore=ARRAY_SIZE
--ignore=PREFER_KERNEL_TYPES
--ignore=CONSTANT_COMPARISON
--ignore=BLOCK_COMMENT_STYLE
Expand Down
7 changes: 7 additions & 0 deletions .github/actions/build-failure-log/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: 'Build Failure Logger'
description: 'Log output of failing build'
runs:
using: 'composite'
steps:
- run: find . -name config.log -exec cat {} \;
shell: bash
7 changes: 7 additions & 0 deletions .github/actions/dump-log/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: 'Dump Logs'
description: 'Dump logs of successful run'
runs:
using: 'composite'
steps:
- run: find . -name "*.log" -exec echo -e "\n\n @@@@@ {} @@@@@\n\n" \; -exec cat {} \;
shell: bash
7 changes: 7 additions & 0 deletions .github/actions/run-failure-log/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: 'Run Failure Logger'
description: 'Log output of failing run'
runs:
using: 'composite'
steps:
- run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
shell: bash
85 changes: 35 additions & 50 deletions .github/workflows/ci-pipeline-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ name: CI arm64
# github.repository has been used to ensure CI is only run on the repo where
# self-hosted runners are installed. This will prevent [self-hosted, ARM64] CI failing on forks

on: [push, pull_request]
on: [push, pull_request, merge_group]
env:
ARCH: arm64
CC: gcc
CONTAINER_NAMESPACE: ghcr.io/opendataplane/odp-docker-images
OS: ubuntu_20.04

jobs:

Build:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
runs-on: [self-hosted, ARM64]
Expand All @@ -31,9 +30,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}"
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- if: ${{ failure() }}
uses: ./.github/actions/build-failure-log

Build_static_u22:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -51,9 +49,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
-e CONF="${CONF} ${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_static.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- if: ${{ failure() }}
uses: ./.github/actions/build-failure-log

Build_OS:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -68,9 +65,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- if: ${{ failure() }}
uses: ./.github/actions/build-failure-log

Build_gcc_u22:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -87,9 +83,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="gcc-${{matrix.cc_ver}}" -e CXX="g++-${{matrix.cc_ver}}"
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/build_${ARCH}.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- if: ${{ failure() }}
uses: ./.github/actions/build-failure-log

Build_out-of-tree:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -99,9 +94,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/out_of_tree.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name config.log -exec cat {} \;
- if: ${{ failure() }}
uses: ./.github/actions/build-failure-log

Run_distcheck:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -116,9 +110,8 @@ jobs:
# Ignore distcheck failure (caused by the first 'make check' run unmounting huge pages)
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}"
-e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/distcheck.sh || true
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -137,9 +130,10 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e ARCH="${ARCH}"
-e CXX=g++-10 -e CONF="${{matrix.conf}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log
- if: ${{ success() }}
uses: ./.github/actions/dump-log

Run_CFLAGS:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -154,9 +148,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${{matrix.cc}}" -e ARCH="${ARCH}"
-e CXX=g++-10 -e CFLAGS="${{matrix.cflags}}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_OS:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -170,9 +163,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${{matrix.os}}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_sched_config:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -182,9 +174,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/sched-basic.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_stash_config:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -194,9 +185,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/stash-custom.conf $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_scheduler_sp:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -206,9 +196,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_SCHEDULER=sp $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_process_mode:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -219,9 +208,8 @@ jobs:
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/process-mode.conf
-e ODPH_PROC_MODE=1 $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_dpdk-19_11:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -231,9 +219,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native-dpdk_19.11 /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_dpdk-20_11:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -243,9 +230,8 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native-dpdk_20.11 /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log

Run_dpdk-21_11:
if: ${{ github.repository == 'OpenDataPlane/odp-dpdk' }}
Expand All @@ -255,6 +241,5 @@ jobs:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
-e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH}-native-dpdk_21.11 /odp/scripts/ci/check.sh
- name: Failure log
if: ${{ failure() }}
run: find . -name "*.trs" | xargs grep -l '^.test-result. FAIL' | while read trs ; do echo FAILURE detected at $trs; cat ${trs%%.trs}.log ; done
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log
Loading

0 comments on commit 8c8f3e2

Please sign in to comment.