Added special handling for Jetpack branches

circle.yml

@@ -8,7 +8,6 @@ general:
     - "logs"
   branches:
     ignore:
-      - /.*[j,J]etpack.*/ # ignore branches with jetpack in their name for Circle - these are run in a separate build
       - /.*[v,V]isdiff.*/ # ignore branches with visdiff in their name for Circle - these are run in a separate build
       - /.*i[o,O][s,S].*/ # ignore branches with iOS in their name for Circle - these are run in a separate build
 

run-wrapper.sh

@@ -7,9 +7,6 @@ if [ "$CIRCLE_NODE_INDEX" == "0" ]; then
   if [ "$SKIP_TEST_REGEX" != "" ]; then
     babel-node --presets es2015 lib/slack-ping-cli.js "Attention! Tests are being skipped with pattern [$SKIP_TEST_REGEX]"
   fi
-  if [ "$RUN_VISDIFF" != "true" ]; then
-    babel-node --presets es2015 lib/slack-ping-cli.js "Attention! Visual Diff tests are currently disabled!"
-  fi
 fi
 
 if [ "$NODE_ENV_OVERRIDE" != "" ]; then
@@ -20,6 +17,8 @@ export TESTARGS="-R -p"
 
 if [ "$RUN_SPECIFIED" == "true" ]; then
   TESTARGS=$RUN_ARGS
+elif [[ "$CIRCLE_BRANCH" =~ .*[Jj]etpack.*|.*[Jj][Pp].* ]]; then
+  TESTARGS="-R -j" # Execute Jetpack tests
 elif [ "$CIRCLE_BRANCH" == "master" ]; then
   TESTARGS="-R -p" # Parallel execution, implies -g -s mobile,desktop
 fi

run.sh

@@ -41,7 +41,7 @@ if [ $# -eq 0 ]; then
   usage
 fi
 
-while getopts ":Rpb:s:givwl:cm:fh" opt; do
+while getopts ":Rpb:s:givwl:cm:fhj" opt; do
   case $opt in
     R)
       REPORTER="-R spec-xunit-slack-reporter"
@@ -91,6 +91,11 @@ while getopts ":Rpb:s:givwl:cm:fh" opt; do
       fi
       exit $?
       ;;
+    j)
+      MOCHA+=" --compilers js:babel-register"
+      SCREENSIZES="desktop,mobile"
+      TARGET="specs-jetpack-calypso/"
+      ;;
     f)
       NODE_CONFIG_ARGS+=("\"failVisdiffs\":\"true\"")
       ;;