Skip to content

Commit

Permalink
many: update to Fedora 40
Browse files Browse the repository at this point in the history
Fedora 40 is out, let's switch to it. Note that we are still fast-
tracking osbuild from the "unpinned" COPR, but let's figure that out in
a follow-up. Baby steps!
  • Loading branch information
ondrejbudai authored and achilleas-k committed May 3, 2024
1 parent 291a8af commit d8e1864
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testingfarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Run the tests
uses: sclorg/testing-farm-as-github-action@v2
with:
compose: Fedora-39
compose: Fedora-40
api_key: ${{ secrets.TF_API_KEY }}
git_url: ${{ github.event.pull_request.head.repo.clone_url }}
git_ref: ${{ github.event.pull_request.head.ref }}
Expand Down
13 changes: 5 additions & 8 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:39 AS builder
FROM registry.fedoraproject.org/fedora:40 AS builder
RUN dnf install -y git-core golang gpgme-devel libassuan-devel && mkdir -p /build/bib
COPY bib/go.mod bib/go.sum /build/bib
ARG GOPROXY=https://proxy.golang.org,direct
Expand All @@ -9,12 +9,9 @@ COPY bib /build/bib
WORKDIR /build
RUN ./build.sh

FROM registry.fedoraproject.org/fedora:39
# Install newer osbuild to fix the loop bug, see
# - https://github.com/osbuild/bootc-image-builder/issues/7
# - https://github.com/osbuild/bootc-image-builder/issues/9
# - https://github.com/osbuild/osbuild/pull/1468
COPY ./group_osbuild-osbuild-fedora-39.repo /etc/yum.repos.d/
FROM registry.fedoraproject.org/fedora:40
# Fast-track osbuild so we don't depend on the "slow" Fedora release process to implement new features in bib
COPY ./group_osbuild-osbuild-fedora.repo /etc/yum.repos.d/
COPY ./package-requires.txt .
RUN grep -vE '^#' package-requires.txt | xargs dnf install -y && rm -f package-requires.txt && dnf clean all
COPY --from=builder /build/bin/* /usr/bin/
Expand All @@ -31,5 +28,5 @@ VOLUME /var/lib/containers/storage
LABEL description="This tools allows to build and deploy disk-images from bootc container inputs."
LABEL io.k8s.description="This tools allows to build and deploy disk-images from bootc container inputs."
LABEL io.k8s.display-name="Bootc Image Builder"
LABEL io.openshift.tags="base fedora39"
LABEL io.openshift.tags="base fedora40"
LABEL summary="A container to create disk-images from bootc container inputs"
6 changes: 3 additions & 3 deletions devel/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:39 AS osbuild-builder
FROM registry.fedoraproject.org/fedora:40 AS osbuild-builder
# build osbuild RPMs
RUN dnf install -y rpm-build dnf-plugins-core git-core
COPY --from=osbuild . /build
Expand All @@ -8,7 +8,7 @@ RUN git config --global --add safe.directory /build
RUN make rpm


FROM registry.fedoraproject.org/fedora:39 AS bib-builder
FROM registry.fedoraproject.org/fedora:40 AS bib-builder
# replace osbuild/images dependency and build bib
RUN dnf install -y git-core golang gpgme-devel libassuan-devel
COPY --from=images . /build/images
Expand All @@ -22,7 +22,7 @@ WORKDIR /build
RUN ./build.sh


FROM registry.fedoraproject.org/fedora:39
FROM registry.fedoraproject.org/fedora:40
COPY --from=osbuild-builder /build/rpmbuild/RPMS/noarch/*.rpm /rpms/
COPY ./package-requires.txt .
RUN grep -vE '^#' package-requires.txt | xargs dnf install -y && rm -f package-requires.txt && dnf install -y /rpms/*.rpm && dnf clean all
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion plans/all.fmf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
summary: Run all tests inside a VM environment
provision:
how: virtual
image: fedora:39
image: fedora:40
# 120 means 120GB, disk has to be specificed here, the format from:
# https://tmt.readthedocs.io/en/stable/spec/hardware.html#disk
# does not work here or below under "hardware"
Expand Down

0 comments on commit d8e1864

Please sign in to comment.