Skip to content

Commit b941e9d

Browse files
committed
SRE-3205 ci: Update for Fedora 42
- redhat-lsb-core no longer supported by Fedora 42 - Fedora 41 and 42 are not available in archive repo, archive repo is only for EOL releases - new test to verify that packaging works for all supported version of Fedora: latest (default), 41, 42 Signed-off-by: Tomasz Gromadzki <[email protected]>
1 parent 8ca33bd commit b941e9d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

packaging/Dockerfile.mockbuild

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77

88
# Pull base image
9-
ARG FVERSION=41
9+
ARG FVERSION=latest
1010
FROM fedora:$FVERSION
1111
# Needed for later use of FVERSION
1212
ARG FVERSION
@@ -26,9 +26,9 @@ RUN chmod +x /tmp/repo-helper.sh && \
2626
rm -f /tmp/repo-helper.sh
2727

2828
# Install basic tools
29-
RUN dnf -y install mock make \
30-
rpm-build createrepo rpmlint redhat-lsb-core git \
31-
python-srpm-macros rpmdevtools && \
29+
RUN dnf -y install mock make \
30+
rpm-build createrepo rpmlint git \
31+
python-srpm-macros rpmdevtools && \
3232
dnf -y clean all
3333

3434
# use same UID as host and default value of 1000 if not specified

packaging/scripts/repo-helper-fedora.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ set -uex
1010
: "${REPOSITORY_NAME:=artifactory}"
1111
: "${archive:=}"
1212
if [ "$FVERSION" != "latest" ]; then
13-
if [ "$FVERSION" != "41" ]; then
14-
archive="-archive"
13+
if [ "$FVERSION" != "42" ]; then
14+
if [ "$FVERSION" != "41" ]; then
15+
archive="-archive"
16+
fi
1517
fi
1618
fi
1719

0 commit comments

Comments
 (0)