github: move to ubuntu 24.04 docker image for CI testing

Signed-off-by: Christian Hopps <chopps@labn.net>
FRRouting · Jan 12, 2025 · 5569071 · 5569071
1 parent 38ff406
commit 5569071
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-test-docker.yml b/.github/workflows/build-test-docker.yml
@@ -13,7 +13,7 @@ defaults:
 
 jobs:
   build-docker:
-    name: Build the ubuntu 22.04 docker image
+    name: Build the ubuntu 24.04 docker image
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -22,13 +22,13 @@ jobs:
           fetch-depth: 1
       - name: Build docker image
         run: |
-          docker build -t frr-ubuntu22 -f docker/ubuntu-ci/Dockerfile .
-          docker save --output /tmp/frr-ubuntu22.tar frr-ubuntu22
+          docker build -t frr-ubuntu24 --build-arg=UBUNTU_VERSION=24.04 -f docker/ubuntu-ci/Dockerfile .
+          docker save --output /tmp/frr-ubuntu24.tar frr-ubuntu24
       - name: Upload docker image artifact
         uses: actions/upload-artifact@v4
         with:
           name: ubuntu-image
-          path: /tmp/frr-ubuntu22.tar
+          path: /tmp/frr-ubuntu24.tar
       - name: Clear any previous results
         # So if all jobs are re-run then all tests will be re-run
         run: |
@@ -43,7 +43,7 @@ jobs:
           overwrite: true
       - name: Cleanup
         if: ${{ always() }}
-        run: rm -rf test-results* /tmp/frr-ubuntu22.tar
+        run: rm -rf test-results* /tmp/frr-ubuntu24.tar
 
   test-docker:
     name: Test ubuntu docker image
@@ -75,7 +75,7 @@ jobs:
           sudo modprobe vrf || true
           sudo modprobe mpls-iptunnel
           sudo modprobe mpls-router
-          docker load --input /tmp/frr-ubuntu22.tar
+          docker load --input /tmp/frr-ubuntu24.tar
 
           if ! grep CONFIG_IP_MROUTE_MULTIPLE_TABLES=y /boot/config*; then
             ADD_DOCKER_ENV+="-e MROUTE_VRF_MISSING=1"
@@ -93,7 +93,7 @@ jobs:
           rm -rf test-results* /tmp/topotests
 
           echo RUN_TESTS: $run_tests
-          if docker run --init -i --privileged --name frr-ubuntu-cont ${ADD_DOCKER_ENV} -v /lib/modules:/lib/modules frr-ubuntu22 \
+          if docker run --init -i --privileged --name frr-ubuntu-cont ${ADD_DOCKER_ENV} -v /lib/modules:/lib/modules frr-ubuntu24 \
             bash -c 'cd ~/frr/tests/topotests ; sudo -E pytest -n$(($(nproc) * 5 / 2)) --dist=loadfile '$run_tests; then
             echo "All tests passed."
             exit 0
@@ -130,7 +130,7 @@ jobs:
           docker rm frr-ubuntu-cont
 
           mv test-results test-results-initial
-          if docker run --init -i --privileged --name frr-ubuntu-cont ${ADD_DOCKER_ENV} -v /lib/modules:/lib/modules frr-ubuntu22 \
+          if docker run --init -i --privileged --name frr-ubuntu-cont ${ADD_DOCKER_ENV} -v /lib/modules:/lib/modules frr-ubuntu24 \
             bash -c 'cd ~/frr/tests/topotests ; sudo -E pytest '$rerun_tests; then
             echo "All rerun tests passed."
             exit 0
@@ -157,7 +157,7 @@ jobs:
       - name: Cleanup
         if: ${{ always() }}
         run: |
-          rm -rf test-results* /tmp/frr-ubuntu22.tar
+          rm -rf test-results* /tmp/frr-ubuntu24.tar
           docker stop frr-ubuntu-cont || true
           docker rm frr-ubuntu-cont || true