Skip to content

Commit

Permalink
Build rpm for rhel-atomic in centos-7
Browse files Browse the repository at this point in the history
RPMs built in the tasks container now fail on rhel-atomic as well, so
build it in the VM.

Closes #97
  • Loading branch information
martinpitt authored Jun 8, 2020
1 parent f5bb072 commit 31eb206
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ srpm: dist-gzip $(PACKAGE_NAME).spec
--define "_srcrpmdir `pwd`" \
$(PACKAGE_NAME).spec

# this is a noarch build, so local rpm build works fine mostly; the exception
# is continuous-atomic, which does not get along with rpms build on Fedora ≥ 31
# this is a noarch build, so local rpm build works fine for recent OSes; but
# RHEL/CentOS Atomic don't get along with rpms built on Fedora ≥ 31
rpm: srpm bots
set -e; srpm=`ls *.src.rpm | head -n1`; \
if [ "$$TEST_OS" = continuous-atomic ]; then \
if [ "$${TEST_OS%-atomic}" != "$$TEST_OS" ]; then \
bots/image-download centos-7; \
test/rpmbuild-vm "$$srpm" centos-7; \
else \
Expand Down

0 comments on commit 31eb206

Please sign in to comment.