Skip to content

Commit 3f41093

Browse files
committed
CI: add Linux label for gtest action (#235)
Also move gtest CI host to a new node. Signed-off-by: Frank Du <[email protected]> (cherry picked from commit 25136b8)
1 parent 0be74b5 commit 3f41093

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.github/workflows/ubuntu_build_with_gtest.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ env:
3636
# Customize the env if
3737
BUILD_TYPE: Release
3838
DPDK_VERSION: 22.11
39-
TEST_PF_PORT_P: 0000:31:00.0
40-
TEST_PF_PORT_R: 0000:31:00.0
41-
TEST_PORT_P: 0000:31:01.0
42-
TEST_PORT_R: 0000:31:01.1
43-
TEST_DMA_PORT_P: 0000:00:01.0
44-
TEST_DMA_PORT_R: 0000:00:01.1
39+
TEST_PF_PORT_P: 0000:af:00.0
40+
TEST_PF_PORT_R: 0000:af:00.0
41+
TEST_PORT_P: 0000:af:01.0
42+
TEST_PORT_R: 0000:af:01.1
43+
TEST_DMA_PORT_P: 0000:80:04.0
44+
TEST_DMA_PORT_R: 0000:80:04.1
4545

4646
jobs:
4747
Build:
4848
if: github.repository == 'OpenVisualCloud/Media-Transport-Library'
49-
runs-on: [self-hosted]
49+
runs-on: [Linux, self-hosted]
5050
timeout-minutes: 60
5151

5252
steps:
@@ -88,7 +88,7 @@ jobs:
8888
Test:
8989
if: github.repository == 'OpenVisualCloud/Media-Transport-Library'
9090
needs: Build
91-
runs-on: [self-hosted]
91+
runs-on: [Linux, self-hosted]
9292
steps:
9393
- name: Kill previous gtest routine
9494
run: |

.github/workflows/upl_rx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"wake_timeout_us" : "1000",
1212
"interfaces": [
1313
{
14-
"port": "0000:31:01.1",
14+
"port": "0000:af:01.1",
1515
"ip": "192.168.89.81",
1616
"netmask": "255.255.254.0",
1717
}

.github/workflows/upl_tx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"wake_timeout_us" : "1000",
1212
"interfaces": [
1313
{
14-
"port": "0000:31:01.0",
14+
"port": "0000:af:01.0",
1515
"ip": "192.168.89.80",
1616
"netmask": "255.255.254.0",
1717
}

docker/ubuntu.dockerfile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ LABEL maintainer="[email protected]"
88
ENV MTL_REPO=Media-Transport-Library
99
ENV DPDK_REPO=dpdk
1010
ENV DPDK_VER=22.11
11+
ENV IMTL_USER=imtl
1112

1213
RUN apt-get update -y
1314

@@ -16,9 +17,17 @@ RUN apt-get install -y git gcc meson python3 python3-pip pkg-config libnuma-dev
1617

1718
RUN pip install pyelftools ninja
1819

20+
RUN apt-get install -y sudo
21+
1922
RUN apt clean all
2023

21-
WORKDIR /opt/
24+
# user: imtl
25+
RUN adduser $IMTL_USER
26+
RUN usermod -G sudo $IMTL_USER
27+
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
28+
USER $IMTL_USER
29+
30+
WORKDIR /home/$IMTL_USER/
2231

2332
RUN git config --global user.email "[email protected]" && \
2433
git config --global user.name "Your Name"
@@ -35,11 +44,10 @@ RUN cd $DPDK_REPO && \
3544
git am ../Media-Transport-Library/patches/dpdk/$DPDK_VER/*.patch && \
3645
meson build && \
3746
ninja -C build && \
38-
ninja -C build install && \
47+
sudo ninja -C build install && \
3948
cd ..
4049

4150
# build mtl
42-
RUN apt-get install -y sudo
4351
RUN cd $MTL_REPO && \
4452
./build.sh && \
4553
cd ..

0 commit comments

Comments
 (0)