Skip to content

Commit 025a040

Browse files
committed
Revert "Packit/TMT: Tmp disable podman-next for tests"
This reverts commit 9839798.
1 parent 9839798 commit 025a040

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

.packit.yaml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,11 @@ jobs:
105105
targets:
106106
- fedora-all
107107
tmt_plan: "/plans/system/*"
108-
# FIXME: we should fetch everything other than podman rpm from this
109-
# repo
110-
# tf_extra_params:
111-
# environments:
112-
# - artifacts:
113-
# - type: repository-file
114-
# id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
108+
tf_extra_params:
109+
environments:
110+
- artifacts:
111+
- type: repository-file
112+
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
115113

116114
- job: tests
117115
identifier: cockpit-revdeps
@@ -128,10 +126,8 @@ jobs:
128126
- artifacts:
129127
- type: repository-file
130128
id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo
131-
# FIXME: we should fetch everything other than podman rpm from this
132-
# repo
133-
#- type: repository-file
134-
# id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
129+
- type: repository-file
130+
id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
135131
tmt:
136132
context:
137133
revdeps: "yes"

plans/system.fmf

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ prepare:
1414
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
1515
dnf -y config-manager --set-enabled epel
1616
order: 10
17-
# FIXME: We should fetch everything except the package we're trying to test from
18-
# here, but there are Epoch conflicts that need to be resolved.
19-
# - when: initiator == packit
20-
# how: shell
21-
# script: |
22-
# COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
23-
# if compgen -G $COPR_REPO_FILE > /dev/null; then
24-
# sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
25-
# fi
26-
# dnf -y upgrade --allowerasing
27-
# order: 20
17+
- when: initiator == packit
18+
how: shell
19+
script: |
20+
COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
21+
if compgen -G $COPR_REPO_FILE > /dev/null; then
22+
sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
23+
fi
24+
dnf -y upgrade --allowerasing
25+
order: 20
2826

2927
adjust+:
3028
- enabled: false

0 commit comments

Comments
 (0)