From: Venkata Harish K Kajur <vk250x@att.com>
Date: Wed, 13 Dec 2017 17:02:23 +0000 (-0500)
Subject: Change chef branch from master to amsterdam
X-Git-Tag: 1.0.1-Amsterdam~39
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a3116127ca79d0bdecef51c4ec4bd7e713b2262d;p=integration.git

Change chef branch from master to amsterdam

Issue-ID: AAI-526
Change-Id: Ia012d891728a18ef7787992c8cb2c5c32cecd416
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---

diff --git a/test/csit/plans/aai/resources/docker-compose.yml b/test/csit/plans/aai/resources/docker-compose.yml
index e965e8cca..c89221bce 100644
--- a/test/csit/plans/aai/resources/docker-compose.yml
+++ b/test/csit/plans/aai/resources/docker-compose.yml
@@ -6,9 +6,9 @@ services:
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
-      - CHEF_BRANCH=master
+      - CHEF_BRANCH=amsterdam
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - AAI_CORE_VERSION=1.1.1-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
     ports:
       - 8447:8447
@@ -23,9 +23,9 @@ services:
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
-      - CHEF_BRANCH=master
+      - CHEF_BRANCH=amsterdam
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - AAI_CORE_VERSION=1.1.1-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
       - DISABLE_UPDATE_QUERY=true
     ports:
diff --git a/test/csit/plans/aai/traversal/docker-compose.yml b/test/csit/plans/aai/traversal/docker-compose.yml
index 7de07a63c..2b6d5d40f 100644
--- a/test/csit/plans/aai/traversal/docker-compose.yml
+++ b/test/csit/plans/aai/traversal/docker-compose.yml
@@ -6,9 +6,9 @@ services:
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
-      - CHEF_BRANCH=master
+      - CHEF_BRANCH=amsterdam
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - AAI_CORE_VERSION=1.1.1-SNAPSHOT
       - LOCAL_USER_ID=${USER_ID}
     ports:
       - 8447:8447
@@ -23,9 +23,9 @@ services:
     environment:
       - AAI_CHEF_ENV=simpledemo
       - AAI_CHEF_LOC=/var/chef/aai-data/environments
-      - CHEF_BRANCH=master
+      - CHEF_BRANCH=amsterdam
       - CHEF_GIT_URL=http://gerrit.onap.org/r/aai
-      - AAI_CORE_VERSION=1.1.0-SNAPSHOT
+      - AAI_CORE_VERSION=1.1.1-SNAPSHOT
       - DISABLE_UPDATE_QUERY=true
     ports:
       - 8446:8446