Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove leftover from old plugin configurations
[fuel.git]
/
build
/
f_isoroot
/
f_ovs-nsh-dpdk-pluginbuild
/
Makefile
diff --git
a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index
700a93c
..
b4844b4
100644
(file)
--- a/
build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/
build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@
-31,7
+31,6
@@
release:.ovsbuild
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
- cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
.ovsbuild:
@rm -rf fuel-plugin-ovs
.ovsbuild:
@rm -rf fuel-plugin-ovs
@@
-50,6
+49,9
@@
release:.ovsbuild
$(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
@rm -rf fuel-plugin-ovs
@touch .ovsbuild
$(REPOINFO) -r . > gitinfo_ovs-nsh-dpdk-plugin.txt
@rm -rf fuel-plugin-ovs
@touch .ovsbuild
+ # Store artifact in cache straight away if caching is enabled
+ # (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
#############################################################################
# Cache operations - only used when building through ci/build.sh