X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=748b58df9ab8d54863ebbf6c696313478e8544c6;hb=81c2f3f3f36f93caab546e569837b2365f167bfa;hp=7723c720843f36c9a3c0545b53191224a09f9e15;hpb=06a429353c0f41083928499589db288ae3275f2a;p=armband.git

diff --git a/Makefile b/Makefile
index 7723c720..748b58df 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,13 @@ all: build
 submodules-init:
 	@git submodule -q init
 	@git submodule -q sync
-	@git submodule update
+	@git submodule update --remote
 
 # Cleans any changes made to submodules
 submodules-clean:
 	@git submodule -q foreach \
-		'git checkout -q armband-workbench-root; \
+		'git am --abort; \
+		git checkout -q armband-workbench-root; \
 		git branch -q -D armband-workbench; \
 		git tag -d armband-workbench-root; \
 		git reset -q --hard HEAD; git clean -xdff'
@@ -32,12 +33,19 @@ patches-import:
 	@git submodule -q foreach 'git checkout -q -b armband-workbench'
 	@git submodule -q foreach \
 		'if [ ! -z "$$(ls ${root}/patches/$$name/)" ]; then \
+			echo "-- patching $$name"; \
 			git am ${root}/patches/$$name/*.patch; \
 		fi'
 clean-docker:
-	docker stop FUEL_CENTOS_8.0 || true
-	docker rm $(docker ps -a -q) || true
-	docker rmi -f $(docker images -q) || true
+	@if [ -d ${root}/upstream/fuel/build ]; then \
+		sudo make -C ${root}/upstream/fuel/build deepclean; \
+	fi
+	@for container in $(shell sudo docker ps -a -q); do \
+		sudo docker rm -f -v $${container}; \
+	done
+	@for image in $(shell sudo docker images -q); do \
+		sudo docker rmi -f $${image}; \
+	done
 
 clean-build:
 	sudo rm -rf /tmp/fuel-main
@@ -47,34 +55,41 @@ clean-build:
 release: export LC_ALL=en_US.UTF-8
 release: submodules-clean clean-docker clean-build submodules-init patches-import build
 
+ifneq ($(REVSTATE),)
+    EXTRA_PARAMS="REVSTATE=$(REVSTATE)"
+endif
+
 build:
 	cd ${root}/upstream/fuel/build && \
-		time make \
-			BUILD_FUEL_PLUGINS=f_odlpluginbuild \
-			FUEL_MAIN_REPO=${root}/upstream/fuel-main \
-			FUEL_MAIN_TAG= \
+		make \
+			BUILD_FUEL_PLUGINS="f_odlpluginbuild f_bgpvpn-pluginbuild" \
 			UBUNTU_ARCH="amd64 arm64" \
-			FUELLIB_REPO=${root}/upstream/fuel-library \
+			ASTUTE_REPO=${root}/upstream/fuel-astute \
+			ASTUTE_COMMIT=HEAD \
 			NAILGUN_REPO=${root}/upstream/fuel-web \
-			FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
-			FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
-			QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
-			OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
-			ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
-			ODL_CHANGE= \
-			FUELLIB_COMMIT=HEAD \
 			NAILGUN_COMMIT=HEAD \
+			FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
 			FUEL_AGENT_COMMIT=HEAD \
+			FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
+			FUEL_NAILGUN_AGENT_COMMIT=HEAD \
+			FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
 			FUEL_MIRROR_COMMIT=HEAD \
-			QEMU_BRANCH=HEAD \
-			OVSNFV_DPDK_BRANCH=armband-workbench \
+			FUELLIB_REPO=${root}/upstream/fuel-library \
+			FUELLIB_COMMIT=HEAD \
+			ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
 			ODL_BRANCH=armband-workbench \
-			PRODUCT_VERSION=8.0 \
-			PRODUCT_NAME=mos \
-			CENTOS_MAJOR=7 \
-			MIRROR_FUEL=http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/os/x86_64/ \
-			MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
-			LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
-			JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
+			ODL_CHANGE= \
+			OPNFV_QUAGGE_PACKAGING_REPO="https://github.com/alexandruavadanii/opnfv-quagga-packaging" \
+			OVS_NSH_DPDK_REPO=${root}/upstream/fuel-plugin-ovs \
+			OVS_NSH_DPDK_BRANCH=HEAD \
+			VSPERF_REPO=${root}/upstream/vswitchperf \
+			VSPERF_BRANCH=armband-workbench \
+			VSPERF_CHANGE= \
+			YARDSTICK_REPO=${root}/upstream/yardstick \
+			YARDSTICK_BRANCH=armband-workbench \
+			YARDSTICK_CHANGE= \
+			EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10" \
+			MIRROR_MOS_UBUNTU=linux.enea.com \
+			$(EXTRA_PARAMS) \
 			iso 2>&1 | tee ${root}/build.log