fix merge

.travis.yml

@@ -4,19 +4,10 @@ node_js:
 matrix:
     include:
         - env: DOCS=full FC_TASK=docs
-          sudo: false
-          node_js :
-            - '6'
         - env: SYSTEST=embedded FC_TASK=systest
         - env: SYSTEST=web FC_TASK=systest
-        - env: SYSTEST=hlf SYSTEST_HLF=hlf  FC_TASK=systest
-          sudo: required
-          services:
-            - docker
+        - env: SYSTEST=hlf SYSTEST_HLF=hlf FC_TASK=systest
         - env: SYSTEST=hlf SYSTEST_HLF=ibm FC_TASK=systest
-          sudo: required
-          services:
-            - docker
 dist: trusty
 addons:
     apt:
@@ -36,8 +27,10 @@ deploy:
     script: ./.travis/deploy.sh
     skip_cleanup: true
     on:
-        all_branches: true
-cache: false
+        branch: master
+cache:
+  directories:
+    - node_modules
 sudo: required
 notifications:
   pushover:

.travis/deploy.sh

@@ -36,6 +36,11 @@ fi
 
 # are we building the docs?
 if [ "${DOCS}" != "" ]; then
+  if [ -z "${TRAVIS_TAG}" ]; then
+    DOCS="full"
+  else
+    DOCS="unstable"
+  fi
   ./.travis/deploy_docs.sh
   exit 0
 fi
@@ -46,8 +51,8 @@ npm config set registry https://registry.npmjs.org/
 npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
 
 # Set the GitHub deploy key we will use to publish.
-set-up-ssh --key "$encrypted_568b95f14ac3_key" \
-           --iv "$encrypted_568b95f14ac3_iv" \
+set-up-ssh --key "$encrypted_8496d53a6fac_key" \
+           --iv "$encrypted_8496d53a6fac_iv" \
            --path-encrypted-key ".travis/github_deploy_key.enc"
 
 # Change from HTTPS to SSH.
@@ -98,6 +103,7 @@ if [ -z "${TRAVIS_TAG}" ]; then
     cf push fabric-composer-next-unstable -c "node cli.js" -i 2 -m 128M --no-start
     cf set-env fabric-composer-next-unstable CLIENT_ID ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_ID}
     cf set-env fabric-composer-next-unstable CLIENT_SECRET ${GH_NEXT_UNSTABLE_OAUTH_CLIENT_SECRET}
+    cf set-env fabric-composer-next-unstable USABILLA_ID ${USABILLA_ID}
     cf start fabric-composer-next-unstable
     popd
 
@@ -138,12 +144,13 @@ else
     cf push fabric-composer-next -c "node cli.js" -i 2 -m 128M --no-start
     cf set-env fabric-composer-next CLIENT_ID ${GH_NEXT_OAUTH_CLIENT_ID}
     cf set-env fabric-composer-next CLIENT_SECRET ${GH_NEXT_OAUTH_CLIENT_SECRET}
+    cf set-env fabric-composer-next USABILLA_ID ${USABILLA_ID}
     cf start fabric-composer-next
     popd
 
     # Configure the Git repository and clean any untracked and unignored build files.
-    git config user.name "Travis CI"
-    git config user.email "[email protected]"
+    git config user.name "${GH_USER_NAME}"
+    git config user.email "${GH_USER_EMAIL}"
     git checkout -b master
     git reset --hard
     git clean -d -f

.travis/deploy_docs.sh

@@ -8,14 +8,14 @@ set -o pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 date
 # Set the GitHub deploy key we will use to publish.
-set-up-ssh --key "$encrypted_f19708b15817_key" \
-           --iv "$encrypted_f19708b15817_iv" \
-           --path-encrypted-key ".travis/github_deploy_docs_key.enc"
+set-up-ssh --key "$encrypted_8496d53a6fac_key" \
+           --iv "$encrypted_8496d53a6fac_iv" \
+           --path-encrypted-key ".travis/github_deploy_key.enc"
 
 # push the html documents
 # Configure the Git repository and clean any untracked and unignored build files.
-git config user.name "Travis CI"
-git config user.email "[email protected]"
+git config user.name "${GH_USER_NAME}"
+git config user.email "${GH_USER_EMAIL}"
 git config push.default simple
 
 echo ${DIR}
@@ -28,8 +28,14 @@ git remote set-url origin ${REPO}.git
 
 cd "${DIR}/packages/composer-website/out/${REPO}"
 
-rm -rf ${DIR}/packages/composer-website/out/${REPO}/*
-cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .
+if [ "${DOCS}" == "full" ]; then
+    rm -rf ${DIR}/packages/composer-website/out/${REPO}/*
+    cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* .
+fi
+
+mkdir -p ${DIR}/packages/composer-website/out/${REPO}/unstable
+rm -rf ${DIR}/packages/composer-website/out/${REPO}/unstable/*
+cp -rf ${DIR}/packages/composer-website/jekylldocs/_site/* ./unstable
 
 git add .
 

PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,12 @@
 <!--- Provide a general summary of the pull request in the Title above -->
 
 ## Checklist
-[ ]  A link to the issue/user story that the pull request relates to
-[ ]  How to recreate the problem without the fix
-[ ]  Design of the fix
-[ ]  How to prove that the fix works
-[ ]  Automated tests that prove the fix keeps on working
-[ ]  Documentation - any JSDoc, website, or Stackoverflow answers?
+ - [ ]  A link to the issue/user story that the pull request relates to
+ - [ ]  How to recreate the problem without the fix
+ - [ ]  Design of the fix
+ - [ ]  How to prove that the fix works
+ - [ ]  Automated tests that prove the fix keeps on working
+ - [ ]  Documentation - any JSDoc, website, or Stackoverflow answers?
 
 
 ## Issue/User story
@@ -39,4 +39,4 @@
 <!-- Please describe the automated tests that are put in place to stop this recurring -->
 
 ## What documentation has been provided for this pull request
-<!-- JSDocs, WebSite and answers to StackOverflow questions are possible documentation sources -->
+<!-- JSDocs, WebSite and answers to StackOverflow questions are possible documentation sources -->

README.md

@@ -26,7 +26,7 @@ You should see messages indicating that the required git repositories have been
 
 You must install [Lerna](https://lernajs.io) to build this multi-package repository:
 
-    $ npm install -g [email protected].32
+    $ npm install -g [email protected].38
 
 You must bootstrap the repository so that all of the dependencies are installed and all of the packages are linked together:
 

appveyor.yml

@@ -0,0 +1,8 @@
+environment:
+  nodejs_version: "6"
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+test_script:
+  - npm test
+build: off

contrib-notes/QA-CHECKLIST-TEMPLATE.md

@@ -0,0 +1,54 @@
+# Fabric-Composer QA
+
+## Platform & version
+  - [ ] ubuntu 16.04
+  - [ ] ubuntu 14.0
+  - [ ] MacOs
+  - [ ] Windows 10
+
+## Fabric Composer
+
+- Version tested: v.r.m - xxxxxxxxxx
+
+### Pre-requisties
+
+  - [ ] Current state of the build is green with all test passing, and all aspects green:  This is for a merge build, not a pull request.
+     - This ensures that the code is clean, unit and systests are passing, documentation is being generated, npm and docker images pushed to the repositories, and the Bluemix images have been pushed
+  - [ ] Ensure that any CRON jobs that are run are also passing
+
+
+## Standard Verification
+
+- [ ] Running the pre-req scripts on clean platform images (within a virtualized environment, install from ISO image of Ubuntu. Follow the preqrequistie tool chain as documented on the website.)
+- [ ] Run the QuickStart and follow on tutorials to ensure they are correct [_note currently this means following the instructions on the website, however there is a plan to automate this_]
+- [ ] Yo Generator (Angular + CLI) - generates and the code runs succesfully
+- [ ] Expose as REST API tutorial
+
+*Documentation*
+
+- [ ] Is the overall initial presentation of the website sound?  No broken links of home page (use w3 tools to check)
+- [ ] Are the JSDocs being produced and linked correctly
+- [ ] Look over the support pages, and the getting started tutorials; are their omissions broken links etc.  
+
+
+## UI
+
+### Stable UI
+ - [ ] Connect to the playground
+ - [ ] Review model, and submit transaction
+ - [ ] Update model, redploy, and submit updated transaction on that model
+
+<!-- The Engagement teams lab @ https://ibm.ent.box.com/file/141636016965 is a good source of the process and information for the Composuer-UI -->
+
+### Next UI
+ - [ ] Running the Car Auction scenario to validate the the new Playground-UI
+
+## Issues Raised
+
+-
+-
+-
+-
+-
+
+## General Obervations