Skip to content

Commit 41b8ad9

Browse files
committed
beaker: deprecate vera package, use enum
Vera package is unmaintained for a while and it won't build (for whatever complicated reason). Deprecate vera in favor of enum which is kind of taken care of by us via rpm-package-workshop.
1 parent 35a23e6 commit 41b8ad9

File tree

4 files changed

+48
-99
lines changed

4 files changed

+48
-99
lines changed

beaker-tests/Sanity/copr-cli-basic-operations/build-spec.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ rlJournalStart
4141

4242
rlPhaseStartTest
4343
rlRun "copr-cli create ${NAME_PREFIX}BuildSpec --enable-net on --chroot $CHROOT" 0
44-
rlRun "copr-cli build ${NAME_PREFIX}BuildSpec $HERE/files/vera.spec" 0
44+
rlRun "copr-cli build ${NAME_PREFIX}BuildSpec $HERE/files/enum.spec" 0
4545

4646
# Make sure we don't upload SRPM/Spec if user tries to build into
4747
# a non-existing project (or project he doesn't have permissions to)
4848
OUTPUT=`mktemp`
49-
rlRun "copr-cli build --nowait ${NAME_PREFIX}NonExisting $HERE/files/vera.spec &> $OUTPUT" 1
49+
rlRun "copr-cli build --nowait ${NAME_PREFIX}NonExisting $HERE/files/enum.spec &> $OUTPUT" 1
5050
rlAssertEquals "" `grep -r 'does not exist' $OUTPUT |wc -l` 1
5151
rlAssertEquals "" `grep -r 'Uploading package' $OUTPUT |wc -l` 0
5252

5353
# Or a non-existing and invalid CoprDir
5454
OUTPUT=`mktemp`
55-
rlRun "copr-cli build --nowait ${NAME_PREFIX}BuildSpec:foo $HERE/files/vera.spec &> $OUTPUT" 1
55+
rlRun "copr-cli build --nowait ${NAME_PREFIX}BuildSpec:foo $HERE/files/enum.spec &> $OUTPUT" 1
5656
rlAssertEquals "" `grep -r "Please use directory format" $OUTPUT |wc -l` 1
5757
rlAssertEquals "" `grep -r 'Uploading package' $OUTPUT |wc -l` 0
5858

5959
# Or a non-existing chroot
6060
OUTPUT=`mktemp`
61-
rlRun "copr-cli build --nowait ${NAME_PREFIX}BuildSpec --chroot foo $HERE/files/vera.spec &> $OUTPUT" 1
61+
rlRun "copr-cli build --nowait ${NAME_PREFIX}BuildSpec --chroot foo $HERE/files/enum.spec &> $OUTPUT" 1
6262
rlAssertEquals "" `grep -r 'not a valid choice' $OUTPUT |wc -l` 1
6363
rlAssertEquals "" `grep -r 'Uploading package' $OUTPUT |wc -l` 0
6464

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Name: enum
2+
Version: 1.1
3+
Release: 1%{?dist}
4+
Summary: Seq- and jot-like enumerator
5+
6+
License: BSD-3-Clause
7+
URL: https://fedorahosted.org/enum
8+
# if this url stop existing, it'll sure be somewhere on the internet ^.^
9+
Source0: https://praiskup.fedorapeople.org/courses/packaging/%{name}-%{version}.tar.bz2
10+
11+
BuildRequires: gcc
12+
BuildRequires: make
13+
BuildRequires: asciidoc
14+
15+
%description
16+
Utility enum enumerates values (numbers) between two values, possibly
17+
further adjusted by a step and/or a count, all given on the command line.
18+
Before printing, values are passed through a formatter. Very fine control
19+
over input interpretation and output is possible.
20+
21+
%prep
22+
%autosetup
23+
24+
25+
%build
26+
%configure
27+
%make_build
28+
29+
30+
%install
31+
%make_install
32+
33+
34+
%files
35+
%license COPYING
36+
%doc ChangeLog
37+
%{_bindir}/enum
38+
%{_mandir}/man1/enum.1*
39+
40+
41+
%changelog
42+
* Mon Sep 30 2024 Jiri Kyjovsky <[email protected]>
43+
- Initial package

beaker-tests/Sanity/copr-cli-basic-operations/files/vera.spec

-94
This file was deleted.

beaker-tests/Sanity/copr-cli-basic-operations/runtest-enable-net.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ rlJournalStart
4141

4242
rlPhaseStartTest
4343
rlRun "copr-cli create ${NAME_PREFIX}BuildSpecNetworking --chroot $CHROOT" 0
44-
rlRun -s "copr-cli build ${NAME_PREFIX}BuildSpecNetworking --enable-net on $HERE/files/vera.spec --nowait" 0
44+
rlRun -s "copr-cli build ${NAME_PREFIX}BuildSpecNetworking --enable-net on $HERE/files/enum.spec --nowait" 0
4545
rlRun "parse_build_id"
4646
rlRun "copr watch-build $BUILD_ID"
4747
rlRun "curl $FRONTEND_URL/backend/get-build-task/$BUILD_ID-$CHROOT | jq .enable_net"

0 commit comments

Comments
 (0)