Skip to content

Commit

Permalink
Move to Ubuntu 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: fruffy <[email protected]>
  • Loading branch information
fruffy committed Aug 14, 2024
1 parent d06bb44 commit f2ce16b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-ptf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:

jobs:
ptf-linux:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
CTEST_PARALLEL_LEVEL: 4
IMAGE_TYPE: test
Expand All @@ -48,10 +48,10 @@ jobs:
key: test-ptf-${{ runner.os }}
max-size: 1000M

- name: Build (Ubuntu 22.04)
- name: Build (Ubuntu 24.04)
run: |
tools/ci-build.sh
- name: Run PTF tests for eBPF backend (Ubuntu 22.04)
- name: Run PTF tests for eBPF backend (Ubuntu 24.04)
run: sudo -E ./test.sh
working-directory: ./backends/ebpf/tests
12 changes: 7 additions & 5 deletions tools/ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ if [[ "${DISTRIB_RELEASE}" != "18.04" ]] ; then
P4C_DEPS+=" cmake"
fi


sudo rm /usr/lib/python3.12/EXTERNALLY-MANAGED
sudo apt-get update
sudo apt-get install -y --no-install-recommends ${P4C_DEPS}
sudo pip3 install --upgrade pip
# sudo pip3 install --upgrade pip
sudo pip3 install -r ${P4C_DIR}/requirements.txt

if [ "${BUILD_GENERATOR,,}" == "ninja" ] && [ ! $(command -v ninja) ]
Expand Down Expand Up @@ -142,10 +144,10 @@ function build_bmv2() {
fi
ccache --set-config max_size=1G

if [[ "${DISTRIB_RELEASE}" != "18.04" ]] ; then
# To run PTF nanomsg tests. Not available on 18.04.
sudo pip3 install nnpy
fi
# if [[ "${DISTRIB_RELEASE}" != "18.04" ]] ; then
# # To run PTF nanomsg tests. Not available on 18.04.
# sudo pip3 install nnpy
# fi
}

if [[ "${INSTALL_BMV2}" == "ON" ]] ; then
Expand Down

0 comments on commit f2ce16b

Please sign in to comment.