- Only run ci_master, release_beta, and ci_beta flows on master commits

- Emit TAP output for the cci flow runs

Author: jlantz

heroku_ci.sh

@@ -9,9 +9,53 @@ nosetests --with-tap --tap-stream --with-coverage --cover-package=cumulusci
 coveralls
 
 # Clone the CumulusCI-Test repo to run test builds against it with cci
+echo "------------------------------------------"
+echo "Running test builds against CumulusCI-Test"
+echo "------------------------------------------"
+echo ""
+echo "Cloning https://github.com/SalesforceFoundation/CumulusCI-Test"
 git clone https://github.com/SalesforceFoundation/CumulusCI-Test
 cd CumulusCI-Test
-cci flow run ci_feature --org scratch --delete-org
-cci flow run ci_master --org packaging
-cci flow run release_beta --org packaging
-cci flow run ci_beta --org scratch --delete-org
+if [ $HEROKU_TEST_RUN_BRANCH -eq "master" ]; then
+    echo "1...4"
+    cci flow run ci_feature --org scratch --delete-org | tee cci.log
+    exit_status=$?
+    if [ $exit_status -eq 0 ]; then
+        echo "ok 1 - Successfully ran ci_feature"
+    else
+        echo "not ok 1 - Failed ci_feature: `tail -1 cci.log`"
+    fi
+        
+    cci flow run ci_master --org packaging | tee -a cci.log
+    exit_status=$?
+    if [ $exit_status -eq 0 ]; then
+        echo "ok 2 - Successfully ran ci_master"
+    else
+        echo "not ok 2 - Failed ci_master: `tail -1 cci.log`"
+    fi
+    cci flow run release_beta --org packaging | tee -a cci.log
+    exit_status=$?
+    if [ $exit_status -eq 0 ]; then
+        echo "ok 3 - Successfully ran release_beta"
+    else
+        echo "not ok 3 - Failed release_beta: `tail -1 cci.log`"
+    fi
+    cci flow run ci_beta --org scratch --delete-org | tee -a cci.log
+    exit_status=$?
+    if [ $exit_status -eq 0 ]; then
+        echo "ok 4 - Successfully ran ci_beta"
+    else
+        echo "not ok 4 - Failed ci_beta: `tail -1 cci.log`"
+    fi
+
+else
+    echo "1...1"
+    cci flow run ci_feature --org scratch --delete-org
+    exit_status=$?
+    if [ $exit_status -eq 0 ]; then
+        echo "ok 1 - Successfully ran ci_feature"
+    else
+        echo "not ok 1 - Failed ci_feature: `tail -1 cci.log`"
+    fi
+fi
+