f_odlpluginbuild: Force .cacheid change

Recent builds use a stale cache of the ODL plugin artifact,
which leads to deploy failures (old Fuel plugin builder was used
to generate that artifact, which did not support multiple DEB
versions, silently excluding the default [5.0.0] version of ODL).

Chasing down the artifact across all build servers requires
extensive work, so we can just force a change in the cache id.

While at it, cleanup non-rebase plugin list (aesthetics).

Change-Id: I174f102f58f83ce6370def6a3de166e0911ff411
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index bed728d..29ab0f7 100644 (file)
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -13,7 +13,7 @@
 # verified it!
 PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild
 export PLUGINS
-NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
+NON_10-0_REBASED_PLUGINS = f_onosfwpluginbuild
 
 # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
 # indicated therein.

diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index d3a7ea8..c0ebba4 100644 (file)
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -43,9 +43,9 @@ release:.odlbuild
        # (no .cacheid will be present unless this is a cached build)
        test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
 
-#############################################################################
+##############################################################################
 # Cache operations - only used when building through ci/build.sh
-#############################################################################
+##############################################################################
 
 
 # Create a unique hash to be used for getting and putting cache, based on: