summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
6b996b0)
- Increase deployment timeout to 4h since some deplyments
takes more than 3h (KVM)
- Fixed build interference between OVSNFV and OVS-NSH where the
later removed the OVSNFV build result from release/opnfv.
A propper fix for SR2 is to have f_isoroot/Makefile remove the release
directory before build, and not have the plugins removing anythin in release
Change-Id: Ibca986554087d6a7f12ed8c7cc6fdd4919368ad2
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
- @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 $(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)
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
- @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 $(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:
@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
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
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
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
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
@touch .ovsnfvbuild
# Store artifact in cache straight away if caching is enabled
# (no .cacheid will be present unless this is a cached build)
@touch .ovsnfvbuild
# Store artifact in cache straight away if caching is enabled
# (no .cacheid will be present unless this is a cached build)
print(log_msg + '\n')
def run_deploy(self):
print(log_msg + '\n')
def run_deploy(self):
SLEEP_TIME = 60
LOG_FILE = 'cloud.log'
SLEEP_TIME = 60
LOG_FILE = 'cloud.log'