Merge pull request #4592 from freedomofpress/ci-crank-dat-parallelism

ci: export junit XML test metadata
freedomofpress · Jul 16, 2019 · 0dec74f · 0dec74f
2 parents 4448d87 + 3b50abd
commit 0dec74f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -142,10 +142,6 @@ jobs:
       - *p2saveimagelayers
       - *p2savecache
 
-      - run:
-          name: Make test results directory
-          command: mkdir -p ~/test-results
-
       - run:
           name: Run tests
           no_output_timeout: 20m
@@ -157,10 +153,10 @@ jobs:
             PYTHON_VERSION=2 DOCKER_RUN_ARGUMENTS=$(bash <(curl -s https://codecov.io/env)) DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-xenial-py2:${fromtag:-latest}" make test
 
       - store_test_results:
-          path: ~/test-results
+          path: ~/project/test-results
 
       - store_artifacts:
-          path: ~/test-results
+          path: ~/project/test-results
 
   python3-app-tests:
     machine:
@@ -180,10 +176,6 @@ jobs:
       - *saveimagelayers
       - *savecache
 
-      - run:
-          name: Make test results directory
-          command: mkdir -p ~/test-results
-
       - run:
           name: Run tests
           command: |
@@ -194,10 +186,10 @@ jobs:
             DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-xenial-py3:${fromtag:-latest}" make test
 
       - store_test_results:
-          path: ~/test-results
+          path: ~/project/test-results
 
       - store_artifacts:
-          path: ~/test-results
+          path: ~/project/test-results
 
   translation-tests:
     machine:
@@ -216,10 +208,6 @@ jobs:
       - *saveimagelayers
       - *savecache
 
-      - run:
-          name: Make test results directory
-          command: mkdir -p ~/test-results
-
       - run:
           name: Run tests
           command: |
@@ -230,7 +218,10 @@ jobs:
             DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-xenial-py3:${fromtag:-latest}" make translation-test
 
       - store_test_results:
-          path: ~/test-results
+          path: ~/project/test-results
+
+      - store_artifacts:
+          path: ~/project/test-results
 
   admin-tests:
     docker:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+# ignore the test-results directory which is used to share logs and
+# test files with the development containers
+test-results
+
 # ignore the production config files that don't end in .example
 securedrop-app-conf.yml
 securedrop-mon-conf.yml

diff --git a/securedrop/bin/run-test b/securedrop/bin/run-test
@@ -20,13 +20,13 @@ maybe_create_config_py
 if [ -n "${CIRCLE_BRANCH:-}" ] ; then
     touch tests/log/firefox.log
     function finish {
-        cp tests/log/firefox.log /tmp/test-results/logs/
+        cp tests/log/firefox.log ../test-results
         bash <(curl -s https://codecov.io/bash)
     }
     trap finish EXIT
 fi
 
-mkdir -p "/tmp/test-results/logs"
+mkdir -p "../test-results"
 
 : "${PAGE_LAYOUT_LOCALES:=en_US,ar}"
 export PAGE_LAYOUT_LOCALES
@@ -36,10 +36,10 @@ pytest \
     --force-flaky --max-runs=3 \
     --page-layout \
     --durations 10 \
-    --junitxml=/tmp/test-results/junit.xml \
+    --junitxml=../test-results/junit.xml \
     --cov-report term-missing \
-    --cov-report html:/tmp/test-results/cov_html \
-    --cov-report xml:/tmp/test-results/cov.xml \
-    --cov-report annotate:/tmp/test-results/cov_annotate \
+    --cov-report html:../test-results/cov_html \
+    --cov-report xml:../test-results/cov.xml \
+    --cov-report annotate:../test-results/cov_annotate \
     --cov=. \
     "$@"