to revert maybe

jaesivsm · Mar 5, 2022 · 194357c · 194357c
1 parent 83765a8
commit 194357c
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,6 +7,9 @@ jobs:
   backend-build:
     machine:
       image: ubuntu-2004:202201-02
+    environment:
+      SERVER_BASH_EXEC="docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr exec server bash -c"
+      SERVER_BASH_ROOT_EXEC="docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr exec -u root server bash -c"
     steps:
       - checkout
       # restore cache and docker layer cache
@@ -102,35 +105,23 @@ jobs:
             make db-bootstrap-tables RUN= COMPOSE_FILE=Dockerfiles/circleci-env.yml
       - run:
           name: Bootstraping database
-          command: >-
-            docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr
-            exec server bash -c "make init-env"
+          command: $SERVER_BASH_EXEC "make init-env"
       - run:
           name: Installing testing dependencies
-          command: >-
-            docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr
-            exec server bash -c "make install"
+          command: $SERVER_BASH_EXEC "make install PIPENV_NOSPIN=true"
       - run:
           name: Running tests
-          command: >-
-            docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr
-            exec server bash -c "make test JARR_CONFIG=example_conf/jarr.json"
+          command: $SERVER_BASH_EXEC "make test JARR_CONFIG=example_conf/jarr.json"
       - run:
           name: Uplaoding coverage to codacy
-          command: >-
-            docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr
-            exec -u root server bash -c "chown -R jarr:jarr /jarr/coverage_results";
-            docker-compose --file Dockerfiles/circleci-env.yml --project-name=jarr
-            exec server bash -c
-            "pipenv run coverage xml -o coverage_results/coverage.xml";
-            pip install --upgrade codacy-coverage;
+          command: |
+            $SERVER_BASH_ROOT_EXEC "chown -R jarr:jarr /jarr/coverage_results"
+            $SERVER_BASH_EXEC "pipenv run coverage xml -o coverage_results/coverage.xml"
+            pip install --upgrade codacy-coverage
             python-codacy-coverage -r ~/coverage_results/coverage.xml
       - run:
           name: Running PEP8 linter
-          command: >-
-            docker-compose --file Dockerfiles/circleci-env.yml
-            --project-name=jarr
-            exec server bash -c "make lint"
+          command: $SERVER_BASH_EXEC "make lint"
 
   push-docker-images:
     machine: