From 976904426258c67eddee6363ff99150481eabd00 Mon Sep 17 00:00:00 2001
From: Jimmy Forsyth <jf2512@att.com>
Date: Wed, 21 Feb 2018 18:15:54 -0500
Subject: Update sdc test and vagrant conf

Change-Id: I632b6b8c8c32fe5fd3cab0e7bf6aaf5cb2026cd0
Issue-ID: SDC-821
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
---
 bootstrap/vagrant-onap/Vagrantfile                           |  2 +-
 .../scripts/sdc/kill_containers_and_remove_dataFolders.sh    |  2 +-
 version-manifest/src/main/resources/docker-manifest.csv      | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bootstrap/vagrant-onap/Vagrantfile b/bootstrap/vagrant-onap/Vagrantfile
index b96e535c0..6d35a1afd 100644
--- a/bootstrap/vagrant-onap/Vagrantfile
+++ b/bootstrap/vagrant-onap/Vagrantfile
@@ -199,7 +199,7 @@ nodes = [
     :macs   => [],
     :cpus   => 2,
     :cpu    => "50",
-    :ram    => 8 * 1024,
+    :ram    => 6 * 1024,
     :groups => ["individual"],
     :args   => ["sdc"],
     :hd     => { :virtualbox => "20480", :libvirt => "20G", },
diff --git a/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh b/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
index efa372ed2..bd5a52214 100644
--- a/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
+++ b/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
@@ -21,8 +21,8 @@ echo "This is ${WORKSPACE}/test/csit/scripts/sdc/kill_and_remove_dataFolder.sh"
 
 # copy logs to archive
 
+cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/
 cp -rf ${WORKSPACE}/data/logs/sdc-sanity/ExtentReport/* ${WORKSPACE}/archives/
-cp -rf ${WORKSPACE}/data/logs/ ${WORKSPACE}/archives/ 
 cp -rf ${WORKSPACE}/data/logs/sdc-sanity/target/*.xml ${WORKSPACE}/archives/
 
 ls -Rt ${WORKSPACE}/archives/
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 4d962ad28..ee1bb4e2d 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -1,20 +1,20 @@
 image,tag
 onap/aai/esr-gui,v1.0.0
 onap/aai/esr-server,v1.0.0
-onap/aai-resources,v1.2.0
-onap/aai-traversal,v1.2.0
+onap/aai-resources,1.2-STAGING-latest
+onap/aai-traversal,1.2-STAGING-latest
 onap/admportal-sdnc-image,v1.2.1
 onap/ccsdk-dgbuilder-image,v0.1.0
 onap/ccsdk-odl-image,v0.1.0
 onap/ccsdk-odlsli-image,v0.1.0
 onap/clamp,v1.1.0
 onap/cli,v1.1.0
-onap/data-router,v1.2.0
+onap/data-router,1.2-STAGING-latest
 onap/dmaap/dmaap-mr,1.0.1
 onap/holmes/engine-management,v1.0.0
 onap/holmes/rule-management,v1.0.0
 onap/modeling/javatoscachecker,v1.0.0
-onap/model-loader,v1.2.0
+onap/model-loader,1.2-STAGING-latest
 onap/msb/msb_apigateway,1.0.0
 onap/msb/msb_discovery,1.0.0
 onap/multicloud/framework,v1.0.0
@@ -43,8 +43,8 @@ onap/sdc/sdc-workflow-designer,1.0.0-STAGING-latest
 onap/sdnc-dmaap-listener-image,v1.2.1
 onap/sdnc-image,v1.2.1
 onap/sdnc-ueb-listener-image,v1.2.1
-onap/search-data-service,v1.2.0
-onap/sparky-be,v1.2.0
+onap/search-data-service,1.2-STAGING-latest
+onap/sparky-be,1.2-STAGING-latest
 onap/usecase-ui/usecase-ui-server,v1.0.1
 onap/usecase-ui,v1.0.1
 onap/vfc/catalog,v1.0.2
-- 
cgit 1.2.3-korg