X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=fuel%2Fbuild%2FMakefile;h=ba4beaf390120fdc2c5f09c6070e53ae8c7ef0c2;hb=563547b4a9f44090f32c0e17d040114854563760;hp=b6b0eac18a3e9f4c21994e65c7fa50852dc738c5;hpb=a5a094a199226f312e795c3019c5793094e5378e;p=genesis.git

diff --git a/fuel/build/Makefile b/fuel/build/Makefile
index b6b0eac..ba4beaf 100644
--- a/fuel/build/Makefile
+++ b/fuel/build/Makefile
@@ -8,15 +8,14 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+SHELL = /bin/bash
 ############################################################################
 # BEGIN of variables to customize
 #
-SHELL = /bin/bash
-
 #Input args
 export UNIT_TEST = FALSE
 export INTERACTIVE = TRUE
-export ISOSRC = file:$(shell pwd)/fuel-6.0.1.iso
+export ISOSRC = file:$(shell pwd)/fuel-6.1.iso
 export ISOCACHE = $(shell pwd)/$(shell basename $(ISOSRC))
 export PRODNO = "OPNFV_BGS"
 export REVSTATE = "P0000"
@@ -28,69 +27,73 @@ export NEWISO = $(shell pwd)/release/opnfv-${REVSTATE}.iso
 #Build variables
 export BUILD_BASE := $(shell pwd)
 export DEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/main
+export UDEB_DEST := $(BUILD_BASE)/release/packages/ubuntu/pool/debian-installer
 export PUPPET_DEST := $(BUILD_BASE)/release/puppet/modules
 export CACHE_DIR := $(BUILD_BASE)/cache
 export VERSION_FILE := $(BUILD_BASE)/.versions
-DOCKERIMG = opnfv.org/ubuntu-builder:14.04
+export DOCKERIMG = opnfv.org/ubuntu-builder:14.04
 export TOPDIR := $(shell pwd)
 
-
-#
-# END of variables to customize
-#############################################################################
-
-#Include definitions
-include config.mk
-include cache.mk
-
-
-ORIGDIR := $(TOPDIR)/origiso
+#Build subclasses
 
 SUBDIRS := f_isoroot
-SUBDIRS += f_opnfv_puppet
-SUBDIRS += f_osnaily
-SUBDIRS += f_l23network
-SUBDIRS += f_resolvconf
-SUBDIRS += f_ntp
-SUBDIRS += f_odl_docker
-
-
 
 # f_example is only an example of how to generate a .deb package and
 # should not be enabled in official builds.
 #SUBDIRS += f_example
 
+ORIGDIR := $(TOPDIR)/origiso
+#
+# END of variables to customize
+#############################################################################
+
 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
 
+
 .PHONY: all
 all:
 	@docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
-	@echo "Versions of cached build results built by" $(shell hostname) "at" $(shell date -u) > $(BUILD_BASE)/.versions
-	@echo "cache.mk" $(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ") >> $(BUILD_BASE)/.versions
-	@echo "config.mk" $(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ") >> $(BUILD_BASE)/.versions
+	@echo "Versions of cached build results built by" $(shell hostname) "at" $(shell date -u) > $(VERSION_FILE)
+	@echo "cache.mk" $(shell md5sum $(BUILD_BASE)/cache.mk | cut -f1 -d " ") >> $(VERSION_FILE)
+	@echo "config.mk" $(shell md5sum $(BUILD_BASE)/config.mk | cut -f1 -d " ") >> $(VERSION_FILE)
 	@make -C docker
 	@docker/runcontext $(DOCKERIMG) $(MAKE) $(MAKEFLAGS) iso
 
-
+############################################################################
+# BEGIN of Include definitions
+#
+include config.mk
+include cache.mk
+#
+# END Include definitions
+#############################################################################
 
 $(ISOCACHE):
 	# Clone Fuel to non-persistent location and build
 	cd /tmp && git clone $(FUEL_MAIN_REPO)
 	cd /tmp/fuel-main && git checkout $(FUEL_MAIN_TAG)
-	@echo "fuel" `git -C /tmp/fuel-main show | grep commit | rev | cut -f1 -d " "` >> ${BUILD_BASE}/.versions
-
+	@echo "fuel" `git -C /tmp/fuel-main show | grep commit | head -1 | cut -d " " -f2` >> $(VERSION_FILE)
 	# Setup cgroups for docker-in-docker
 	sudo /root/enable_dockerx2
-	# Patch to fix race condition when doing "Docker-in-Docker" build
-	cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_1.patch
-	# Patch to make the sandbox chroot in Fuel succeed with package
-	# installation in a Docker build
-	cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_2.patch
+	# Temporary patch to accomodate for new Ubuntu trusty devops keys not yet
+	# backported to fuel 6.0 or 6.1
+	cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_3.patch
+	# Patch for adding dosfstools, as Fuel 6.1 is running mkfs.vfat
+	cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_5.patch
 	# Remove Docker optimizations, otherwise multistrap will fail during
 	# Fuel build.
 	sudo rm -f /etc/apt/apt.conf.d/docker*
 	#
 	cd /tmp/fuel-main && ./prepare-build-env.sh
+	cd /tmp/fuel-main && make repos
+	# Patch for speeding up image creation in virtual environments,
+	# https://review.openstack.org/#/c/197943/
+	cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-agent_1.patch
+	cd /tmp/fuel-main/build/repos/nailgun && git config --global user.email "build$opnfv.org"
+	cd /tmp/fuel-main/build/repos/nailgun && git config --global user.name "OPNFV build"
+	cd /tmp/fuel-main/build/repos/nailgun && git add -u .
+	cd /tmp/fuel-main/build/repos/nailgun && git commit -m "Added patch"
+	#
 	cd /tmp/fuel-main && make iso
 	mv /tmp/fuel-main/build/artifacts/fuel*.iso .
 
@@ -107,21 +110,13 @@ umount-origiso:
 
 .PHONY: $(SUBDIRS)
 $(SUBDIRS):
-	@mkdir -p release/packages/ubuntu/pool/main release/puppet/modules release/isoroot
+	@mkdir -p release/packages/ubuntu/pool/main release/packages/ubuntu/pool/debian-installer release/puppet/modules release/isoroot
 	$(MAKE) -C $@ -f Makefile release
 
 .PHONY: patch-packages
 patch-packages:
 	ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
 
-.PHONY: prepare
-prepare:
-	#$(MAKE) -C opendaylight -f Makefile setup
-
-.PHONY: odl
-odl:
-	#$(MAKE) -C opendaylight -f Makefile
-
 .PHONY: build-clean $(SUBCLEAN)
 build-clean: $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
@@ -130,13 +125,11 @@ build-clean: $(SUBCLEAN)
 	@rm -f $(NEWISO)
 
 .PHONY: clean $(SUBCLEAN)
-clean:  prepare $(SUBCLEAN)
+clean:  clean-cache $(SUBCLEAN)
 	$(MAKE) -C patch-packages -f Makefile clean
-	#$(MAKE) -C opendaylight -f Makefile clean
 	@rm -f *.iso
 	@rm -Rf release
 	@rm -Rf newiso
-	@rm -f f_odl
 	@rm -f $(NEWISO)
 	@rm -f $(BUILD_BASE)/.versions
 
@@ -146,6 +139,12 @@ $(SUBCLEAN): %.clean:
 # Todo: Make things smarter - we shouldn't need to clean everything
 # betwen make invocations.
 .PHONY: iso
-iso:	prepare build-clean odl $(ISOCACHE) $(SUBDIRS) patch-packages
+iso:	build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
 	install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
 	@printf "\n\nProduct ISO is $(NEWISO)\n\n"
+
+# Start a bash shell in docker for Makefile debugging
+.PHONY: debug
+debug:
+	@docker version >/dev/null 2>&1 || (echo 'No Docker installation available'; exit 1)
+	docker/runcontext $(DOCKERIMG) bash