Skip to content

Commit

Permalink
TODO: Bump to fedora 41.
Browse files Browse the repository at this point in the history
TODO: Numan is actually the original author of this.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
  • Loading branch information
dceara committed Jan 27, 2025
1 parent c073a5c commit f38a06e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ OVS_PATH=${OVS_PATH:-$OVN_PATH/ovs}
CONTAINER_CMD=${CONTAINER_CMD:-podman}
CONTAINER_WORKSPACE="/workspace"
CONTAINER_WORKDIR="/workspace/ovn-tmp"
IMAGE_NAME=${IMAGE_NAME:-"ovn-org/ovn-tests"}
IMAGE_NAME=${IMAGE_NAME:-"dceara/ovn-tests"}
TIMEOUT=${TIMEOUT:-"0"}

# Test variables
Expand Down
4 changes: 2 additions & 2 deletions .ci/ovn-kubernetes/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG OVNKUBE_COMMIT
ARG GO_VERSION

FROM fedora:37 AS ovnbuilder
FROM fedora:41 AS ovnbuilder

USER root

Expand Down Expand Up @@ -63,7 +63,7 @@ COPY --from=ovnbuilder /tmp/ovn/ovn-sb.ovsschema pkg/sbdb/ovn-sb.ovsschema
RUN go generate ./pkg/nbdb && go generate ./pkg/sbdb && make

# Build the final image
FROM fedora:37
FROM fedora:41

# install needed dependencies
RUN INSTALL_PKGS=" \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:

env:
IMAGE_REGISTRY: ghcr.io
IMAGE_NAMESPACE: ovn-org
IMAGE_NAMESPACE: dceara
IMAGE_NAME: ovn-tests
CONTAINERS_PATH: ./utilities/containers
DEPENDENCIES: podman

jobs:
container:
if: github.repository_owner == 'ovn-org'
if: github.repository_owner == 'dceara'
runs-on: ubuntu-24.04
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ovn-fake-multinode-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- { repo: ovn-org/ovn, branch: "branch-22.03" }
env:
RUNC_CMD: podman
OS_IMAGE: "fedora:39"
OS_IMAGE: "fedora:41"
# https://github.com/actions/runner-images/issues/6282
XDG_RUNTIME_DIR: ''
steps:
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
name: multinode tests ${{ join(matrix.cfg.*, ' ') }}
env:
RUNC_CMD: podman
OS_IMAGE: "fedora:39"
OS_IMAGE: "fedora:41"
CENTRAL_IMAGE: "ovn/ovn-multi-node:${{ matrix.cfg.branch }}"
CHASSIS_IMAGE: "ovn/ovn-multi-node:${{ github.ref_name }}"
RELAY_IMAGE: "ovn/ovn-multi-node:${{ github.ref_name }}"
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
env:
DEPENDENCIES: podman
name: Prepare container
if: github.repository_owner == 'ovn-org' || github.event_name != 'schedule'
if: github.repository_owner == 'dceara' || github.event_name != 'schedule'
runs-on: ubuntu-24.04

steps:
Expand All @@ -47,17 +47,12 @@ jobs:
run: |
echo "IMAGE_DISTRO=fedora" >> $GITHUB_ENV
- name: Build container
if: github.ref_name != 'main'
run: make ${{ env.IMAGE_DISTRO }}
working-directory: utilities/containers

- name: Download container
if: github.ref_name == 'main'
run: podman pull ghcr.io/ovn-org/ovn-tests:${{ env.IMAGE_DISTRO }}
if: github.ref_name != 'main'
run: podman pull ghcr.io/dceara/ovn-tests:${{ env.IMAGE_DISTRO }}

- 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 dceara/ovn-tests:${{ env.IMAGE_DISTRO }}

- name: Cache image
id: image_cache
Expand Down Expand Up @@ -236,7 +231,7 @@ jobs:
name: linux rpm fedora
if: github.repository_owner == 'ovn-org' || github.event_name != 'schedule'
runs-on: ubuntu-22.04
container: fedora:40
container: fedora:41
timeout-minutes: 30

strategy:
Expand Down
2 changes: 1 addition & 1 deletion utilities/containers/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CONTAINER_CMD ?= podman
IMAGE_NAME ?= "ovn-org/ovn-tests"
IMAGE_NAME ?= "dceara/ovn-tests"
CONTAINERS_PATH ?= "."

distros := fedora ubuntu
Expand Down
2 changes: 1 addition & 1 deletion utilities/containers/fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/fedora/fedora:40
FROM quay.io/fedora/fedora:41

ARG CONTAINERS_PATH

Expand Down

0 comments on commit f38a06e

Please sign in to comment.