group commands after machines - use multi line keys 2

Signed-off-by: Bonczidai Levente <[email protected]>
CloudSlang · Aug 7, 2015 · 4df6168 · 4df6168
1 parent c52b31a
commit 4df6168
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/circle.yml b/circle.yml
@@ -15,7 +15,7 @@ machine:
   environment:
     # "${CIRCLE_PR_NUMBER}" = "" denotes that the build is not part of a fork PR
     # ignore test suites on node 1 in fork builds
-    ACTIVE_CI_TEST_SUITES_NODE_1: $(if [ "${CIRCLE_PR_NUMBER}" = "" ]; then echo '!default,coreos,cadvisor'; else echo '!default'; fi)
+    ACTIVE_CI_TEST_SUITES_DROPLETS_NODE: $(if [ "${CIRCLE_PR_NUMBER}" = "" ]; then echo '!default,coreos,cadvisor'; else echo '!default'; fi)
     RULE_DROPLET_MACHINE_NOT_FORK: '[ "${CIRCLE_NODE_INDEX}" = "1" ] && [ "${CIRCLE_PR_NUMBER}" = "" ]'
   pre:
     - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.6.2-circleci'; sudo chmod 0755 /usr/bin/docker; true
@@ -30,29 +30,34 @@ dependencies:
 
 test:
   pre:
-    - ? >
+    - ? > ### machine 0
         if [ "${CIRCLE_NODE_INDEX}" = "0" ];
         then docker run -d -p 49165:8080 jenkins
         && docker run -d -p 8500:8500 -p 8600:8600/udp fhalim/consul;
         fi
       : parallel: true
     - if eval "${RULE_DROPLET_MACHINE_NOT_FORK}"; then chmod +x ci-env/create_droplets.sh && ci-env/create_droplets.sh; fi:
-        parallel: true
-    - wget https://github.com/CloudSlang/cloud-slang/releases/download/cloudslang-0.8.RC1/cslang-builder.zip:
-        parallel: true
-    - unzip cslang-builder.zip -d cslang-builder:
-        parallel: true
-    - chmod +x cslang-builder/bin/cslang-builder:
-        parallel: true
-    - mkdir cslang-builder/lib/Lib:
-        parallel: true
-    - pip install -r python-lib/requirements.txt -t cslang-builder/lib/Lib:
-        parallel: true
-    - if eval "${RULE_DROPLET_MACHINE_NOT_FORK}"; then chmod +x ci-env/wait_for_droplets_and_update_test_inputs.sh && ci-env/wait_for_droplets_and_update_test_inputs.sh; fi:
-        parallel: true
+        parallel: true ### machine 1
+    - ? > ### every machine
+        wget https://github.com/CloudSlang/cloud-slang/releases/download/cloudslang-0.8.RC1/cslang-builder.zip
+        && unzip cslang-builder.zip -d cslang-builder
+        && chmod +x cslang-builder/bin/cslang-builder
+        && mkdir cslang-builder/lib/Lib
+        && pip install -r python-lib/requirements.txt -t cslang-builder/lib/Lib
+      : parallel: true
+    - ? > ### machine 1
+        if eval "${RULE_DROPLET_MACHINE_NOT_FORK}";
+        then chmod +x ci-env/wait_for_droplets_and_update_test_inputs.sh
+        && ci-env/wait_for_droplets_and_update_test_inputs.sh;
+        fi
+      : parallel: true
   override:
-    - case ${CIRCLE_NODE_INDEX} in 0) ./cslang-builder/bin/cslang-builder -ts default,jenkins,consul -cov ;; 1) ./cslang-builder/bin/cslang-builder -ts ${ACTIVE_CI_TEST_SUITES_NODE_1} -cov ;; esac:
-        parallel: true
+    - ? >
+        case ${CIRCLE_NODE_INDEX} in
+        0) ./cslang-builder/bin/cslang-builder -ts default,jenkins,consul -cov ;;
+        1) ./cslang-builder/bin/cslang-builder -ts ${ACTIVE_CI_TEST_SUITES_DROPLETS_NODE} -cov ;;
+        esac
+      : parallel: true
   post:
     - if eval "${RULE_DROPLET_MACHINE_NOT_FORK}"; then chmod +x ci-env/cleanup_env.sh && ci-env/cleanup_env.sh; fi:
-         parallel: true
+         parallel: true ### machine 1