Bump to the latest Ubuntu LTS image, this allows us to get rid of crun direct download as Ubuntu 24.04 has 1.14.1 version available out of the box.
Signed-off-by: Ales Musil <[email protected]> --- .cirrus.yml | 6 ------ .github/workflows/ovn-fake-multinode-tests.yml | 12 ++---------- .github/workflows/ovn-kubernetes.yml | 4 ++-- .github/workflows/test.yml | 17 ++++++----------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 14a54a0fe..4e0344eb7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -57,12 +57,6 @@ arm_unit_tests_task: - sudo apt update - sudo apt install -y podman - # XXX This should be removed when native crun >=1.9.1 - update_crun_script: - - crun --version - - curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-arm64"; -o /usr/bin/crun - - chmod +x /usr/bin/crun - download_cache_script: - curl http://$CIRRUS_HTTP_CACHE_HOST/${CIRRUS_CHANGE_IN_REPO} -o /tmp/image.tar diff --git a/.github/workflows/ovn-fake-multinode-tests.yml b/.github/workflows/ovn-fake-multinode-tests.yml index 19d95f175..ea08c5a1b 100644 --- a/.github/workflows/ovn-fake-multinode-tests.yml +++ b/.github/workflows/ovn-fake-multinode-tests.yml @@ -14,7 +14,7 @@ jobs: build: name: Build ovn-fake-multinode image if: github.repository_owner == 'ovn-org' || github.event_name != 'schedule' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: cfg: @@ -71,7 +71,7 @@ jobs: path: /tmp/_output/ovn_${{ matrix.cfg.branch }}_image.tar multinode-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 needs: [build] strategy: @@ -139,14 +139,6 @@ jobs: sudo systemctl start openvswitch-switch sudo ovs-vsctl show - # XXX This should be removed when native crun >=1.9.1 - - name: update crun script - run: | - crun --version - sudo curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-amd64"; -o /usr/bin/crun - sudo chmod +x /usr/bin/crun - echo "New crun version: "$(crun --version) - - name: Start basic cluster run: | sudo -E CHASSIS_COUNT=4 GW_COUNT=4 ./ovn_cluster.sh start diff --git a/.github/workflows/ovn-kubernetes.yml b/.github/workflows/ovn-kubernetes.yml index 83a305aa2..c3f0e76e5 100644 --- a/.github/workflows/ovn-kubernetes.yml +++ b/.github/workflows/ovn-kubernetes.yml @@ -25,7 +25,7 @@ jobs: build: name: Build if: github.repository_owner == 'ovn-org' || github.event_name != 'schedule' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Enable Docker experimental features run: | @@ -65,7 +65,7 @@ jobs: e2e: name: e2e if: github.event_name != 'schedule' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 220 strategy: fail-fast: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 463d717ef..75493acdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,8 +56,11 @@ jobs: if: github.ref_name == 'main' run: podman pull ghcr.io/ovn-org/ovn-tests:${{ env.IMAGE_DISTRO }} + - name: Tag image + run: podman tag ovn-org/ovn-tests:${{ env.IMAGE_DISTRO }} ovn-org/ovn-tests + - name: Export image - run: podman save -o /tmp/image.tar --format oci-archive ovn-org/ovn-tests:${{ env.IMAGE_DISTRO }} + run: podman save -o /tmp/image.tar --format oci-archive ovn-org/ovn-tests - name: Cache image id: image_cache @@ -80,7 +83,7 @@ jobs: UNSTABLE: ${{ matrix.cfg.unstable }} name: linux ${{ join(matrix.cfg.*, ' ') }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false @@ -144,14 +147,6 @@ jobs: path: /tmp/image.tar key: ${{ github.sha }}/${{ github.event_name }} - # XXX This should be removed when native crun >=1.9.1 - - name: update crun script - run: | - crun --version - sudo curl -L "https://github.com/containers/crun/releases/download/1.14.1/crun-1.14.1-linux-amd64"; -o /usr/bin/crun - sudo chmod +x /usr/bin/crun - echo "New crun version: "$(crun --version) - - name: load image run: | sudo podman load -i /tmp/image.tar @@ -235,7 +230,7 @@ jobs: build-linux-rpm: name: linux rpm fedora if: github.repository_owner == 'ovn-org' || github.event_name != 'schedule' - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 container: fedora:40 timeout-minutes: 30 -- 2.48.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
