From b742ded032303e060a48f0b1afa7887d446e7799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Linkiewicz?= Date: Thu, 30 Jan 2025 12:41:20 +0100 Subject: [PATCH] PF ports adjustment for CiCd runner (#1052) PF ports adjustment for CiCd runner JSON file fixes to reflect the changes Signed-off-by: Milosz Linkiewicz --- .github/workflows/ubuntu_build_with_gtest.yml | 19 +++++++++---------- .github/workflows/upl_gtest.json | 14 +++++++------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ubuntu_build_with_gtest.yml b/.github/workflows/ubuntu_build_with_gtest.yml index a90af505d..ec5bc8f91 100644 --- a/.github/workflows/ubuntu_build_with_gtest.yml +++ b/.github/workflows/ubuntu_build_with_gtest.yml @@ -20,10 +20,10 @@ env: # Customize the env if BUILD_TYPE: Release DPDK_VERSION: 23.11 - TEST_PF_PORT_P: 0000:af:00.0 - TEST_PF_PORT_R: 0000:af:00.0 - TEST_PORT_P: 0000:af:01.2 - TEST_PORT_R: 0000:af:01.3 + TEST_PF_PORT_P: "0000:49:00.0" + TEST_PF_PORT_R: "0000:49:00.0" + TEST_PORT_P: "0000:49:01.2" + TEST_PORT_R: "0000:49:01.3" TEST_DMA_PORT_P: 0000:80:04.0 TEST_DMA_PORT_R: 0000:80:04.1 @@ -39,7 +39,7 @@ jobs: changed: ${{ steps.filter.outputs.linux_gtest == 'true' }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v2 id: filter with: @@ -57,7 +57,7 @@ jobs: with: egress-policy: audit - - name: Checkout IMTL + - name: Checkout MTL uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Checkout DPDK @@ -74,8 +74,7 @@ jobs: - name: Apply dpdk patches run: | - cd dpdk - git am ../patches/dpdk/${{ env.DPDK_VERSION }}/*.patch + patch -d "dpdk" -p1 -i <(cat patches/dpdk/${{ env.DPDK_VERSION }}/*.patch) - name: Build dpdk run: | @@ -135,7 +134,7 @@ jobs: - name: Run udp ld preload test case run: | - sudo MUFD_CFG=.github/workflows/upl_gtest.json LD_PRELOAD=/usr/local/lib/x86_64-linux-gnu/libmtl_udp_preload.so ./build/tests/KahawaiUplTest --p_sip 192.168.89.80 --r_sip 192.168.89.81 + sudo MUFD_CFG=.github/workflows/upl_gtest.json LD_PRELOAD=/usr/local/lib/x86_64-linux-gnu/libmtl_udp_preload.so ./build/tests/KahawaiUplTest --p_sip 192.168.2.80 --r_sip 192.168.2.81 - name: Run st2110 test case run: | @@ -147,4 +146,4 @@ jobs: - name: Run st2110 st20p test case with kernel loopback run: | - ./build/tests/KahawaiTest --p_port kernel:lo --r_port kernel:lo --auto_start_stop --gtest_filter=St20p* \ No newline at end of file + ./build/tests/KahawaiTest --p_port kernel:lo --r_port kernel:lo --auto_start_stop --gtest_filter=St20p* diff --git a/.github/workflows/upl_gtest.json b/.github/workflows/upl_gtest.json index 01428d38a..2c1cb7f19 100644 --- a/.github/workflows/upl_gtest.json +++ b/.github/workflows/upl_gtest.json @@ -11,14 +11,14 @@ "wake_timeout_us" : "1000", "interfaces": [ { - "port": "0000:af:01.0", - "ip": "192.168.89.80", - "netmask": "255.255.254.0", + "port": "0000:49:01.0", + "ip": "192.168.2.80", + "netmask": "255.255.255.0" }, { - "port": "0000:af:01.1", - "ip": "192.168.89.81", - "netmask": "255.255.254.0", + "port": "0000:49:01.1", + "ip": "192.168.2.81", + "netmask": "255.255.255.0" } - ], + ] }