7 files changed, 17 insertions, 4 deletions
diff --git a/bootstrap/vagrant-onap/lib/commons b/bootstrap/vagrant-onap/lib/commons
index ba7c7613a..2b01dc524 100755
--- a/bootstrap/vagrant-onap/lib/commons
+++ b/bootstrap/vagrant-onap/lib/commons
@@ -24,7 +24,6 @@ function is_package_installed {
 # install_packages() - Install a list of packages
 function install_packages {
     local package=$@
-    update_repos
     apt-get install -y -qq $package
 }
 
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 1a1b2aa4c..de6f9ee33 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -75,6 +75,7 @@ function install_java {
     fi
     install_package software-properties-common
     add-apt-repository -y ppa:openjdk-r/ppa
+    update_repos
 
     # Remove Java 7
     uninstall_packages default-jre openjdk-7-jdk openjdk-7-jre openjdk-7-jre-headless
@@ -92,6 +93,7 @@ function install_maven {
     install_java
     install_package software-properties-common
     add-apt-repository -y ppa:andrei-pozolotin/maven3
+    update_repos
     install_package maven3
 
     # Remove Java 7
@@ -173,6 +175,7 @@ function install_docker {
         add-apt-repository \
         "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
         $(lsb_release -cs) stable"
+    update_repos
 
     install_package docker-ce
     _configure_docker_settings
diff --git a/bootstrap/vagrant-onap/tests/_test_base b/bootstrap/vagrant-onap/tests/_test_base
index 7d0415a44..78c7f8bb4 100644
--- a/bootstrap/vagrant-onap/tests/_test_base
+++ b/bootstrap/vagrant-onap/tests/_test_base
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 source /var/onap_tests/asserts
+source /var/onap/commons
 
 # main() - Starting point for Unit Tests
 function main {
     local covered_functions=("$@")
 
+    update_repos
     len=${#covered_functions[@]}
     echo "1..$len"
     for i in ${!covered_functions[@]}; do
diff --git a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
index 7083f3d02..748d1b553 100755
--- a/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
+++ b/bootstrap/vagrant-onap/vagrant_utils/postinstall.sh
@@ -6,6 +6,7 @@ fi
 
 source /var/onap/functions
 
+update_repos
 create_configuration_files
 install_dev_tools
 configure_bind
diff --git a/test/csit/plans/sdnc/healthcheck/setup.sh b/test/csit/plans/sdnc/healthcheck/setup.sh
index 5e51b0e6a..4fb66d8c3 100644
--- a/test/csit/plans/sdnc/healthcheck/setup.sh
+++ b/test/csit/plans/sdnc/healthcheck/setup.sh
@@ -37,7 +37,7 @@ fi
 # Clone SDNC repo to get docker-compose for SDNC
 mkdir -p $WORKSPACE/archives/sdnc
 cd $WORKSPACE/archives
-git clone -b master --single-branch http://gerrit.onap.org/r/sdnc/oam.git sdnc
+git clone -b master --single-branch --depth=1 http://gerrit.onap.org/r/sdnc/oam.git sdnc
 cd $WORKSPACE/archives/sdnc
 git pull
 unset http_proxy https_proxy
@@ -55,6 +55,14 @@ docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VER
 docker pull $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION onap/admportal-sdnc-image:latest
 
+docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION
+docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-ueb-listener-image:latest
+
+docker pull $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERSION
+
+docker tag $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-dmaap-listener-image:latest
+
+
 # start SDNC containers with docker compose and configuration from docker-compose.yml
 curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose
 chmod +x docker-compose
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 75c60c72b..b6e5d3c3f 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -40,4 +40,4 @@ openecomp/sdc-frontend,1.1-STAGING-latest
 openecomp/sdc-elasticsearch,1.1-STAGING-latest
 openecomp/sdc-kibana,1.1-STAGING-latest
 openecomp/sdc-sanity,1.1-STAGING-latest
-
+openecomp/vid,1.1-STAGING-latest
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index e22129f56..a332ffcc1 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -55,5 +55,5 @@ org.openecomp.sdc.sdc-distribution-client,sdc-main-distribution-client,1.1.32
 org.openecomp.sdc.jtosca,jtosca,1.1.1
 org.openecomp.sdc.sdc-tosca,sdc-tosca,1.1.32
 org.openecomp.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.0.0
-
+org.openecomp.vid,asdcclient,1.0.2