X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deploy_vm1.sh;h=4e55d62274b6e3b9ad2fa44b9f9ef554cf8fc709;hb=d382a5a38ef08e09b19dcd83279ac0c3118aef0d;hp=73702010ac85937bbab567f9f865b2e4ad6b5825;hpb=3aa1cab0aed348f0790d312715a5fae70f3cabb3;p=aai%2Ftest-config.git

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 7370201..4e55d62 100755
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -100,14 +100,14 @@ DOCKER_REGISTRY=${NEXUS_DOCKER_REPO}
 RESOURCES_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 TRAVERSAL_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 GRAPHADMIN_DOCKER_IMAGE_VERSION=1.0-STAGING-latest
-SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.2.1
-DATA_ROUTER_DOCKER_IMAGE_VERSION=1.2.2
-MODEL_LOADER_DOCKER_IMAGE_VERSION=1.2.1
+SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+DATA_ROUTER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+MODEL_LOADER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 SPARKY_BE_DOCKER_IMAGE_VERSION=1.2.1
-CHAMP_DOCKER_IMAGE_VERSION=1.2.3
-GIZMO_DOCKER_IMAGE_VERSION=1.2.0
-SPIKE_DOCKER_IMAGE_VERSION=1.2.0
-BABEL_DOCKER_IMAGE_VERSION=1.2.0
+CHAMP_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+GIZMO_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
+SPIKE_DOCKER_IMAGE_VERSION=1.0-STAGING-latest
+BABEL_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
@@ -150,46 +150,6 @@ function check_if_user_exists(){
         }
 }
 
-# Instead of duplicating the changes from aai-common
-# Clone the repo and extract the oxm and dbedgerules
-function retrieve_schema_edgerules(){
-
-    local current_branch=$(git rev-parse --abbrev-ref HEAD);
-    local current_dir=$(pwd);
-
-    local microservice_name=aai-common;
-    temp_dir=/tmp/${microservice_name}-$(uuidgen);
-    (
-        mkdir -p ${temp_dir} && cd ${temp_dir};
-        rm -r ${current_dir}/aai-schema
-
-        git init
-        git remote add origin https://gerrit.onap.org/r/aai/aai-common
-        git config core.sparsecheckout true
-
-        # Specifies which folders to checkout from the repo
-        # Limited to only the aai-resources as we don't need other folders from
-        # microservice deployment for this repository
-
-        echo "aai-schema/src/main/resources/**" >> .git/info/sparse-checkout
-
-        git fetch --depth=1 origin ${current_branch} && {
-            git checkout ${current_branch}
-        } || {
-            echo "Unable to find the branch ${current_branch} in aai-common, so using default branch ${default_branch}";
-            git fetch --depth=1 origin ${default_branch}
-            git checkout ${default_branch}
-        }
-
-        mkdir -p ${current_dir}/aai-schema
-        cp -R ${temp_dir}/aai-schema/src/main/resources/onap/ ${current_dir}/aai-schema
-
-        rm -rf ${temp_dir}
-    );
-}
-
-retrieve_schema_edgerules;
-
 docker pull ${DOCKER_REGISTRY}/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION};
 docker tag $DOCKER_REGISTRY/onap/aai-graphadmin:${GRAPHADMIN_DOCKER_IMAGE_VERSION} $DOCKER_REGISTRY/onap/aai-graphadmin:latest;