summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile4
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile8
-rw-r--r--deploy/cloud/deployment.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index b4844b420..5e38b4c53 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -22,12 +22,12 @@ all: .ovsbuild
.PHONY: clean
clean:
- @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs*.rpm fuel-plugin-ovs*.rpm
+ @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs-*.rpm fuel-plugin-ovs-*.rpm
@rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
.PHONY: release
release:.ovsbuild
- @rm -f ../release/opnfv/fuel-plugin-ovs*.rpm
+ @rm -f ../release/opnfv/fuel-plugin-ovs-*.rpm
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
index 6bc5769a5..4ca5236a0 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
@@ -22,18 +22,18 @@ all: .ovsnfvbuild
.PHONY: clean
clean:
- @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv*.rpm fuel-plugin-ovsnfv*.rpm
+ @rm -f .ovsnfvbuild ../release/opnfv/fuel-plugin-ovsnfv-*.rpm fuel-plugin-ovsnfv-*.rpm
@rm -f $(BUILD_BASE)/gitinfo_ovsnfv-dpdk-plugin.txt gitinfo_ovsnfv-dpdk-plugin.txt
.PHONY: release
release:.ovsnfvbuild
- @rm -f ../release/opnfv/fuel-plugin-ovsnfv*.rpm
+ @rm -f ../release/opnfv/fuel-plugin-ovsnfv-*.rpm
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/
cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE)
.ovsnfvbuild:
- @rm -rf fuel-plugin-ovsnfv
+ @rm -rf ovsnfv
sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
sudo pip install fuel-plugin-builder
git clone $(OVSNFV_DPDK_REPO) ovsnfv
@@ -47,7 +47,7 @@ release:.ovsnfvbuild
INCLUDE_DEPENDENCIES=true fpb --debug --build $(OVSNFV_DPDK_DIR)
@mv ovsnfv/$(OVSNFV_DPDK_DIR)/fuel-plugin-ovsnfv*.rpm .
$(REPOINFO) -r . > gitinfo_ovsnfv-dpdk-plugin.txt
- @rm -rf fuel-plugin-ovsnfv
+ @rm -rf ovsnfv
@touch .ovsnfvbuild
# Store artifact in cache straight away if caching is enabled
# (no .cacheid will be present unless this is a cached build)
diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py
index 63c8c1e53..42bab09bb 100644
--- a/deploy/cloud/deployment.py
+++ b/deploy/cloud/deployment.py
@@ -96,7 +96,7 @@ class Deployment(object):
print(log_msg + '\n')
def run_deploy(self):
- WAIT_LOOP = 180
+ WAIT_LOOP = 240
SLEEP_TIME = 60
LOG_FILE = 'cloud.log'