> On April 13, 2016, 2:51 p.m., John Sirois wrote: > > Thanks for following up - the source change from github to apache's > > download redirector service was a good idea and it seems a more appropriate > > source to boot! > > > > This worked for me using `./build-artifact.sh /tmp/snapshot.tar.gz 0.13.0` > > only after: > > ```diff > > diff --git a/specs/rpm/Makefile b/specs/rpm/Makefile > > index 0476bcb..950f91e 100644 > > --- a/specs/rpm/Makefile > > +++ b/specs/rpm/Makefile > > @@ -21,7 +21,7 @@ DATETIME ?= $(shell date +%Y%m%d%H%M) > > AURORA_VERSION ?= $(shell cat $(TOPDIR)/.auroraversion | tr '-' '.') > > MESOS_VERSION ?= $(shell tr -d "'\" \t" < $(TOPDIR)/3rdparty/python/BUILD > > | sed -n 's/MESOS_REV=(.*)/\1/p' ) > > > > -SOURCE_TARGET ?= $(RPM_TOPDIR)/rpmbuild/SOURCES/$(AURORA_VERSION).tar.gz > > +SOURCE_TARGET ?= > > $(RPM_TOPDIR)/rpmbuild/SOURCES/apache-aurora-$(AURORA_VERSION).tar.gz > > > > PHONY: all nightly_version release_version get_source_target clean mkdir > > srpm nightly_srpm nightly_rpm release_srpm release_rpm tar_source > > ``` > > > > If you add that change and rebase (there were changes to the removed/moved > > pants.ini in https://reviews.apache.org/r/45662/) - this change LGTM and > > I'll patch it in.
Hi, I think this is not sufficient. Therotically, we should be able to build Aurora from the spec file "as is", but also from any git branch (including a SNAPSHOT version). This is why I propose this patch : for the centos builder, we introduce the notion of AURORA_INTERNAL_VERSION, which is the content of .auroraversion. It helps locating the sources, but the final RPM will be versioned using the version arg passed to build-artifact.sh (as it is done for debian/ubuntu builders). I tested it by building the current 0.13.1-SNAPSHOT from sources, and I rebased from master. - Pierre ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/45298/#review128683 ----------------------------------------------------------- On April 19, 2016, 10:48 a.m., Pierre Cheynier wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/45298/ > ----------------------------------------------------------- > > (Updated April 19, 2016, 10:48 a.m.) > > > Review request for Aurora and John Sirois. > > > Repository: aurora-packaging > > > Description > ------- > > An operator should be able to build Aurora on his platform without > relying on Docker. > > Even if this is an interesting way of doing it, it sometimes introduce missed > (build-)dependencies (in this case openssl) and context-specific behaviour > (here, the way pants.ini was added to the build context) > > > Diffs > ----- > > builder/deb/debian-jessie/Dockerfile > fd15dfe6fd4518cfe9915b7339c1b3e609e968d7 > builder/deb/debian-jessie/pants.ini > 446ea8d8ebb4fce2665dc4c7c1a2ea32d5f18707 > builder/deb/ubuntu-trusty/Dockerfile > a4a9e648537841583fdc02c006bfa00a3a095aca > builder/deb/ubuntu-trusty/pants.ini > builder/rpm/centos-7/Dockerfile a4d9dfcee5637d23333c31d0c2b63a9ebcf04e8d > builder/rpm/centos-7/build.sh be3c6fb970dbdd1b94630473e6f67e4a91700e43 > builder/rpm/centos-7/pants.ini > specs/debian/control 9dd927df63f68afc10506a7dcab8d26f21fbee33 > specs/debian/rules 974fddfda6da04686daae691fa32c5b4c11a0b5d > specs/rpm/Makefile 0476bcbda489bf53edc2101831475fe4a4ea3241 > specs/rpm/aurora.spec fa89242f0c39ca058bc791dab18f67f75150e2d2 > > Diff: https://reviews.apache.org/r/45298/diff/ > > > Testing > ------- > > Able to build on CentOS 6 using mock. > Able to build on Debian. Limitation = need the patched version of Gradle. > Still able to build using the current Docker build system > > > Thanks, > > Pierre Cheynier > >
