Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch CI to f39 and add COPR and COPR_RPMS vars to Dockerfile #1438

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Switch CI to f39 and add COPR and COPR_RPMS vars to Dockerfile #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3e6c5
Switch CI to Fedora 39
inknos Jan 23, 2024
400e6e7
Introduce COPR and COPR_RPMS variables
inknos Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $ podman build --build-arg TYPE=distro -t ci-dnf-stack -f Dockerfile
# $ podman run --net none -it ci-dnf-stack behave dnf

ARG BASE=fedora:38
ARG BASE=fedora:39
FROM $BASE

ENV LANG C.UTF-8
Expand Down Expand Up @@ -31,6 +31,12 @@ RUN set -x && \
dnf -y distro-sync --repo copr:copr.fedorainfracloud.org:rpmsoftwaremanagement:dnf-nightly; \
fi

RUN set -x && \
if [ -n "$COPR" ] && [ -n "$COPR_RPMS" ]; then \
dnf -y copr enable $COPR; \
dnf -y install $COPR_RPMS; \
fi

# copy test suite
COPY ./dnf-behave-tests/ /opt/ci/dnf-behave-tests

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ansible
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $ podman build --build-arg TYPE=distro -t ansible -f Dockerfile.ansible
# $ podman run --net none -it ansible ./ansible

FROM fedora:38
FROM fedora:39
ARG TYPE=nightly

# enable nightlies if requested
Expand Down
2 changes: 1 addition & 1 deletion dnf-behave-tests/dnf/plugins-third/swidtags.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# the swidtags plugin is available only in Fedora
@use.with_os=fedora__ge__30
@use.with_os=fedora__le__38
Feature: Smoke test for swidtags dnf plugin


Expand Down
2 changes: 2 additions & 0 deletions dnf-behave-tests/requirements.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ BuildRequires: python3-dnf-plugin-show-leaves

%if 0%{?fedora}
BuildRequires: python3-dnf-plugin-system-upgrade
%if 0%{?fedora} < 39
BuildRequires: dnf-plugin-swidtags
%endif
%endif

BuildRequires: microdnf

Expand Down
Loading