Skip to content

Commit a18cefb

Browse files
committed
revert: restore original .packit.yaml
The ci-dnf-stack fix will be submitted as a separate PR to rpm-software-management/ci-dnf-stack instead. Signed-off-by: Devesh B <98201065+DeveshB-1@users.noreply.github.com>
1 parent 25ed35c commit a18cefb

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

.packit.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ packages:
1616
downstream_package_name: dnf5
1717
actions:
1818
get-current-version:
19-
- bash -c 'rpmspec -q --queryformat "%{VERSION}
20-
" dnf5.spec | head -n1'
19+
- bash -c 'rpmspec -q --queryformat "%{VERSION}\n" dnf5.spec | head -n1'
2120

2221
# Test build with disabled modules.
2322
# Use separate package configuration because Packit
@@ -77,8 +76,7 @@ jobs:
7776
# fill in Release as if packit would have done it
7877
- bash -c "sed -i -r \"s/Release:(\s*)\S+/Release:\1${PACKIT_RPMSPEC_RELEASE}%{?dist}/\" dnf5.spec"
7978
get-current-version:
80-
- bash -c 'rpmspec -q --queryformat "%{VERSION}
81-
" dnf5.spec | head -n1'
79+
- bash -c 'rpmspec -q --queryformat "%{VERSION}\n" dnf5.spec | head -n1'
8280
packages: [dnf5-without-modules]
8381
additional_repos:
8482
- "copr://rpmsoftwaremanagement/dnf-nightly"
@@ -87,8 +85,8 @@ jobs:
8785
identifier: "dnf5-tests"
8886
targets:
8987
- fedora-all
90-
fmf_url: https://github.com/DeveshB-1/ci-dnf-stack.git
91-
fmf_ref: &CI_DNF_STACK_REF feat/metadata-cache-age-display
88+
fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git
89+
fmf_ref: &CI_DNF_STACK_REF main
9290
tmt_plan: "^/plans/integration/behave-dnf5$"
9391
packages: [dnf5]
9492
tf_extra_params:
@@ -102,7 +100,7 @@ jobs:
102100
identifier: "createrepo_c-tests"
103101
targets:
104102
- fedora-all
105-
fmf_url: https://github.com/DeveshB-1/ci-dnf-stack.git
103+
fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git
106104
fmf_ref: *CI_DNF_STACK_REF
107105
tmt_plan: "^/plans/integration/behave-createrepo_c$"
108106
packages: [dnf5]
@@ -118,7 +116,7 @@ jobs:
118116
manual_trigger: true
119117
targets:
120118
- fedora-all
121-
fmf_url: https://github.com/DeveshB-1/ci-dnf-stack.git
119+
fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git
122120
fmf_ref: *CI_DNF_STACK_REF
123121
tmt_plan: "^/plans/integration/behave-dnf$"
124122
packages: [dnf5]
@@ -133,7 +131,7 @@ jobs:
133131
identifier: "dnf5daemon-tests"
134132
targets:
135133
- fedora-all
136-
fmf_url: https://github.com/DeveshB-1/ci-dnf-stack.git
134+
fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git
137135
fmf_ref: *CI_DNF_STACK_REF
138136
tmt_plan: "^/plans/integration/behave-dnf5daemon$"
139137
packages: [dnf5]
@@ -148,8 +146,8 @@ jobs:
148146
identifier: "ABI-check"
149147
targets:
150148
- fedora-rawhide-x86_64
151-
fmf_url: https://github.com/DeveshB-1/ci-dnf-stack.git
152-
fmf_ref: feat/metadata-cache-age-display
149+
fmf_url: https://github.com/rpm-software-management/ci-dnf-stack.git
150+
fmf_ref: main
153151
tmt_plan: "^/plans/integration/abi-libdnf5$"
154152
packages: [dnf5]
155153
tf_extra_params:

0 commit comments

Comments
 (0)