Commit Graph

6 Commits (69aadbb8ceac02dd85e5d7277a22fc32d3ee99c0)

Author SHA1 Message Date
Ken Dreyer 323d59b786 Makefile: remove fedpkg dependency for "srpm"
It's not currently possible to install EPEL 7's fedpkg alongside the
centos-packager package in CentOS 7 Extras (for /usr/bin/cbs), because
they each depend on slightly different Koji package versions.

This means that we cannot run "make srpm" on a system where
centos-packager is installed, because that depends on fedpkg.

Remove the dependency on fedpkg for the "srpm" target, and run
rpmbuild -bs directly.

The purpose of this change is to make it easier to automatically
build ceph-ansible SRPMs in Jenkins/cbs.centos.org.
2017-09-13 10:46:37 -06:00
Ken Dreyer 08a87e59e4 Makefile: handle "rc" version tags
When "git describe" returns an "rc" tag (eg "2.2.0rc1"), insert the RC
number into the RPM's "Release" field.

Add comments with some git-describe values and NVRs.
2017-03-07 11:16:11 -07:00
Ken Dreyer db241751db Makefile: generate tagged RPMs with "-1" release value
Prior to this change, if we built an RPM from a tagged commit, the RPM
would have a release value of "0".

This causes some problems with RPM version comparisons when comparing
version numbers with "rc" tags/packages, which should also have a
less-than-one Release value.
2017-03-07 11:11:53 -07:00
Ken Dreyer 20e7bad984 Makefile: improve version detection
Prior to this change, if there was a stray tag in the repository that
did not start with a "v", the Makefile would still try to use that tag
as a version tag when constructing the RPMs.

Only use the tags that start with "v", in this case.
2016-12-12 14:22:29 -07:00
Ken Dreyer cda441595b Makefile: strip "v" from RPM versions
Prior to this change, all RPMs would have a Version field that started
with "v", for example "ceph-ansible-v2.0.0-163.g2c98b1d.el7"

Strip the "v" out in these cases, so that the version is simply a
number.
2016-12-12 14:22:08 -07:00
Ken Dreyer a8557b0a83 add RPM packaging for CI
"make rpm" will build a ceph-ansible RPM and place it in the current
working directory.

This will allow us to run this command in Jenkins for every branch.
2016-11-17 15:23:44 -07:00