From 099e26d848b5aa9b390ba2f1da24ecc62f3179dc Mon Sep 17 00:00:00 2001 From: davidjchou Date: Thu, 18 Aug 2016 13:59:24 -0700 Subject: Claenup Remove the workaround marked by "# fix me" mentioned in commit id: e8928f93b50df3ecb11942ab754bae848c082c6a, since the issue (some files generated during kvmfornfv building are owned by "root") already resolved in fuel-plugin-kvm build process. Change-Id: I5efb60173b9974f6fba25f04da1f4b1f53207b1a Signed-off-by: davidjchou --- build/f_isoroot/f_kvm-pluginbuild/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/f_isoroot/f_kvm-pluginbuild/Makefile b/build/f_isoroot/f_kvm-pluginbuild/Makefile index ba2fd0be0..7268699c3 100644 --- a/build/f_isoroot/f_kvm-pluginbuild/Makefile +++ b/build/f_isoroot/f_kvm-pluginbuild/Makefile @@ -33,8 +33,7 @@ release:.kvmbuild cp gitinfo_kvm-plugin.txt $(BUILD_BASE) .kvmbuild: - # fix me - @sudo rm -rf kvmfornfv + @rm -rf kvmfornfv ../../docker/ubuntu-builder/install_docker.sh git clone $(KVMFORNFV_REPO) cd kvmfornfv; \ @@ -47,8 +46,7 @@ release:.kvmbuild INCLUDE_DEPENDENCIES=true fpb --debug --build ./ @mv kvmfornfv/fuel-plugin/fuel-plugin-kvm*.rpm . $(REPOINFO) -r . > gitinfo_kvm-plugin.txt - # fix me - @sudo rm -rf kvmfornfv + @rm -rf kvmfornfv @touch .kvmbuild # Store artifact in cache straight away if caching is enabled # (no .cacheid will be present unless this is a cached build) -- cgit 1.2.3-korg