diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-09 18:40:22 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-19 17:26:48 +0200 |
commit | ec307077e542fd290701a871fedc7f58db37712c (patch) | |
tree | 2be475e78a5b3493f70463d6f48147bbb46814e6 /patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch | |
parent | b340f0cbf6841133288178ed764baa93f93ac3fc (diff) |
build: ISO refactor, use docker, enable cache
Previously, Armband Makefile used to call Fuel@OPNFV Makefile
target <iso>, instead of <all>, which resulted in bypassing
using Docker for ISO building completely.
Switch to <all> Makefile target, hence bringing back Docker
as a build container.
This change justifies moving make variables to a separate spec
file, armband.mk.
While at it, enable caching of builds.
This requires Jenkins bash scripts to be updated for the ISO
build job, done in [1].
JIRA: ARMBAND-56
[1] https://gerrit.opnfv.org/gerrit/#/c/18453/
CHANGES:
- all: release (was all: build)
- Common make targets now depend on submodules-init;
- clean-build and clean-docker make targets have been replaced by:
make clean, make deepclean;
FIXME: These issues should be fixed later:
- (optional) trim local repo paths from gitinfo files
- only account for armband submodules in cache fingerprints;
- identify size mismatch culprit
Change-Id: I7d73409be44983fa21d4c09d2e07b87a33231e03
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch')
-rw-r--r-- | patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch b/patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch new file mode 100644 index 00000000..acbbc11c --- /dev/null +++ b/patches/opnfv-fuel/0041-build-Allow-PLUGINS-override.patch @@ -0,0 +1,27 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 10 Aug 2016 16:43:39 +0200 +Subject: [PATCH] build: Allow PLUGINS override + +Instead of using BUILD_FUEL_PLUGINS, which was intended for manual +overrides of the Fule@OPNFV plugin list, allow PLUGINS to be +preset to a custom list, which we will provide via Armband +Makefile spec. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile +index 4df7bcb..448f415 100644 +--- a/build/f_isoroot/Makefile ++++ b/build/f_isoroot/Makefile +@@ -11,7 +11,7 @@ + # Add Fuel plugin build targets here + # Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have + # verified it! +-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild ++PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild + #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild + export PLUGINS + #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild |