From: Jingzhao.Ni <Jingzhao.Ni@arm.com>
Date: Mon, 17 Jun 2019 09:40:56 +0000 (+0800)
Subject: Fix bug & Modify VM configuration
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F1002%2F1;p=ci-management.git

Fix bug & Modify VM configuration

1. The "docker ps" command without sudo privilege causes getting wrong
 docker id.
2. Modify the virtual cpu number and virtual memory capacity up to
 12G

Signed-off-by: Jingzhao.Ni <Jingzhao.Ni@arm.com>
Change-Id: Ic3af4ef06fc32a8101d78257ce7d300826f1f7fc
---

diff --git a/jjb/iec/iec-compass-build.sh b/jjb/iec/iec-compass-build.sh
index 3a5e2d8..96ce02e 100755
--- a/jjb/iec/iec-compass-build.sh
+++ b/jjb/iec/iec-compass-build.sh
@@ -34,7 +34,7 @@ COMPASS_WORK_DIR=$WORKSPACE/../compass-work
 mkdir -p $COMPASS_WORK_DIR
 ln -s $COMPASS_WORK_DIR work
 
-sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true
+sudo docker rm -f `sudo docker ps | grep compass | cut -f1 -d' '` || true
 
 curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true
 
diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh
index 17b74cb..dca5a15 100755
--- a/jjb/iec/iec-compass-deploy.sh
+++ b/jjb/iec/iec-compass-deploy.sh
@@ -14,7 +14,7 @@ export KUBERNETES_VERSION="v1.13.0"
 
 export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
 export NETWORK="deploy/conf/vm_environment/network.yml"
-export VIRT_NUMBER=3 VIRT_CPUS=2 VIRT_MEM=8192 VIRT_DISK=50G
+export VIRT_NUMBER=3 VIRT_CPUS=4 VIRT_MEM=12288 VIRT_DISK=50G
 
 ./deploy.sh