Skip to content

Commit 2a93778

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 <tomasz.gromadzki@hpe.com>
1 parent 231257e commit 2a93778

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

packaging/Dockerfile.mockbuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ set -uex
1010
: "${REPOSITORY_NAME:=artifactory}"
1111
: "${archive:=}"
1212
if [ "$FVERSION" != "latest" ]; then
13-
archive="-archive"
13+
if [ "$FVERSION" != "42" ]; then
14+
if [ "$FVERSION" != "41" ]; then
15+
archive="-archive"
16+
fi
17+
fi
1418
fi
1519

1620
# shellcheck disable=SC2120
@@ -62,7 +66,7 @@ if [ -n "$REPO_FILE_URL" ]; then
6266
pushd /etc/yum.repos.d/
6367
curl -k --noproxy '*' -sSf \
6468
-o "daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo" \
65-
"{$REPO_FILE_URL}daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"
69+
"${REPO_FILE_URL}daos_ci-fedora${archive}-${REPOSITORY_NAME}.repo"
6670
disable_repos /etc/yum.repos.d/
6771
popd
6872
fi

0 commit comments

Comments
 (0)