prefix and manifest are linked. if we want to use a prefix for servic…

…es, then a custom manifest is needed so set the two together.

IBM-Cloud/insurance-bot#15

.bluemix/catalog-api.pipeline.yml

@@ -33,19 +33,13 @@ stages:
 
       # The branch may use a custom manifest
       MANIFEST=manifest.yml
+      PREFIX=""
       if [ -f ${REPO_BRANCH}-manifest.yml ]; then
         MANIFEST=${REPO_BRANCH}-manifest.yml
-      fi
-      echo "Using manifest file: $MANIFEST"
-
-      # and a prefix for services if not building the master branch
-      if [ "$REPO_BRANCH" == "master" ]; then
-        echo "No prefix for master branch"
-        PREFIX=""
-      else
         PREFIX=$REPO_BRANCH"-"
-        echo "Using prefix: $PREFIX"
       fi
+      echo "Using manifest file: $MANIFEST"
+      echo "Using prefix: $PREFIX"
 
       # Create CF services
       cf create-service cloudantNoSQLDB Lite ${PREFIX}insurance-policy-db

.bluemix/dashboard.pipeline.yml

@@ -62,17 +62,10 @@ stages:
       MANIFEST=manifest.yml
       if [ -f ${REPO_BRANCH}-manifest.yml ]; then
         MANIFEST=${REPO_BRANCH}-manifest.yml
-      fi
-      echo "Using manifest file: $MANIFEST"
-
-      # and a prefix for services if not building the master branch
-      if [ "$REPO_BRANCH" == "master" ]; then
-        echo "No prefix for master branch"
-        PREFIX=""
-      else
         PREFIX=$REPO_BRANCH"-"
-        echo "Using prefix: $PREFIX"
       fi
+      echo "Using manifest file: $MANIFEST"
+      echo "Using prefix: $PREFIX"
 
       # Create CF services
       cf create-service cloudantNoSQLDB Lite ${PREFIX}insurance-bot-db

.bluemix/order-api.pipeline.yml

@@ -37,19 +37,13 @@ stages:
 
       # The branch may use a custom manifest
       MANIFEST=manifest.yml
+      PREFIX=""
       if [ -f ${REPO_BRANCH}-manifest.yml ]; then
         MANIFEST=${REPO_BRANCH}-manifest.yml
-      fi
-      echo "Using manifest file: $MANIFEST"
-
-      # and a prefix for services if not building the master branch
-      if [ "$REPO_BRANCH" == "master" ]; then
-        echo "No prefix for master branch"
-        PREFIX=""
-      else
         PREFIX=$REPO_BRANCH"-"
-        echo "Using prefix: $PREFIX"
       fi
+      echo "Using manifest file: $MANIFEST"
+      echo "Using prefix: $PREFIX"
 
       # Create CF services
       cf create-service cloudantNoSQLDB Lite ${PREFIX}insurance-policy-db

.bluemix/ui.pipeline.yml

@@ -41,19 +41,13 @@ stages:
 
       # The branch may use a custom manifest
       MANIFEST=manifest.yml
+      PREFIX=""
       if [ -f ${REPO_BRANCH}-manifest.yml ]; then
         MANIFEST=${REPO_BRANCH}-manifest.yml
-      fi
-      echo "Using manifest file: $MANIFEST"
-
-      # and a prefix for services if not building the master branch
-      if [ "$REPO_BRANCH" == "master" ]; then
-        echo "No prefix for master branch"
-        PREFIX=""
-      else
         PREFIX=$REPO_BRANCH"-"
-        echo "Using prefix: $PREFIX"
       fi
+      echo "Using manifest file: $MANIFEST"
+      echo "Using prefix: $PREFIX"
 
       # Create CF services
       cf create-service conversation standard insurance-bot-conversation