From c52b31aa2edc510e89aa12a5d56e54043594e68b Mon Sep 17 00:00:00 2001 From: Bonczidai Levente Date: Fri, 7 Aug 2015 11:16:36 +0300 Subject: [PATCH] group commands after machines - use multi line keys 1 Signed-off-by: Bonczidai Levente --- circle.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/circle.yml b/circle.yml index 942e40eb72..c4e1530a85 100644 --- a/circle.yml +++ b/circle.yml @@ -30,24 +30,26 @@ dependencies: test: pre: - - if eval "${RULE_DROPLET_MACHINE_NOT_FORK}"; then chmod +x ci-env/create_droplets.sh && ci-env/create_droplets.sh; fi: - parallel: true - - if [ "${CIRCLE_NODE_INDEX}" = "0" ]; then docker run -d -p 49165:8080 jenkins; fi: - parallel: true - - if [ "${CIRCLE_NODE_INDEX}" = "0" ]; then docker run -d -p 8500:8500 -p 8600:8600/udp fhalim/consul; 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 + - ? > + 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 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