diff --git a/.circleci/config.yml b/.circleci/config.yml index fdb7696..622622e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,7 +87,6 @@ commands: command: | py.test integration-tests/test_bootstrap.py -s - jobs: integration-test: docker: @@ -107,32 +106,32 @@ jobs: - plugin_tests upgrade-test: - docker: - - image: docker:18.05.0-ce-git + docker: + - image: docker:18.05.0-ce-git - steps: - - run: - name: Check upgrade testing - command: | - if [ "$CIRCLE_BRANCH" == "master" ]; then - echo "On master, no upgrade to test..." - circleci-agent step halt - else - echo "PR detected, testing upgrade..." - fi - - run: - name: setup python3 - command: | - apk add --no-cache python3 pytest - - checkout - - setup_remote_docker - - build_systemd_image - - basic_tests: - upgrade: "--upgrade" - - admin_tests: - upgrade: "--upgrade" - - plugin_tests: - upgrade: "--upgrade" + steps: + - run: + name: Check upgrade testing + command: | + if [ "$CIRCLE_BRANCH" == "master" ]; then + echo "On master, no upgrade to test..." + circleci-agent step halt + else + echo "PR detected, testing upgrade..." + fi + - run: + name: setup python3 + command: | + apk add --no-cache python3 pytest + - checkout + - setup_remote_docker + - build_systemd_image + - basic_tests: + upgrade: "--upgrade" + - admin_tests: + upgrade: "--upgrade" + - plugin_tests: + upgrade: "--upgrade" workflows: version: 2