p/fuel: ci/deploy.sh: Fix deploy without sudo

Previous rebase left out the "sudo" invocation for apt-get/yum calls.

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

diff --git a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
index d361b79..04337f2 100644 (file)
--- a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
+++ b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
@@ -19,7 +19,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  2 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 3ac7ff1..cf22d10 100755
+index a77dd0f..aec8048 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
 @@ -270,9 +270,10 @@ pushd "${DEPLOY_DIR}" > /dev/null

diff --git a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch b/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch
index 5561343..3b50079 100644 (file)
--- a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch
+++ b/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] deploy: Allow non-root deploys
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ci/deploy.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ ci/deploy.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/ci/deploy.sh b/ci/deploy.sh
-index cf22d10..3d7ccf5 100755
+index aec8048..c1ec31b 100755
 --- a/ci/deploy.sh
 +++ b/ci/deploy.sh
 @@ -87,7 +87,7 @@ $(notify "Disabled input parameters (not yet supported with MCP):" 3)
@@ -31,3 +31,16 @@ index cf22d10..3d7ccf5 100755
      exit 1
  fi
 
+@@ -269,10 +269,10 @@ pushd "${DEPLOY_DIR}" > /dev/null
+ # scenario, etc.
+
+ # Install required packages
+-[ -n "$(command -v apt-get)" ] && apt-get install -y \
++[ -n "$(command -v apt-get)" ] && sudo apt-get install -y \
+   git make rsync mkisofs curl virtinst cpu-checker qemu-kvm vgabios && \
+     ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin
+-[ -n "$(command -v yum)" ] && yum install -y \
++[ -n "$(command -v yum)" ] && sudo yum install -y \
+   git make rsync genisoimage curl virt-install qemu-kvm vgabios
+
+ # Check scenario file existence