cleanup ci (#216)

Author: Samantha Andow

.circleci/config.yml

@@ -5,15 +5,6 @@ commands:
     description: "checkout merge branch"
     steps:
       - checkout
-  #     - run:
-  #         name: Checkout merge branch
-  #         command: |
-  #           set -ex
-  #           BRANCH=$(git rev-parse --abbrev-ref HEAD)
-  #           if [[ "$BRANCH" != "master" ]]; then
-  #             git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
-  #             git checkout "merged/$CIRCLE_BRANCH"
-  #           fi
 
 binary_common: &binary_common
   parameters:
@@ -84,7 +75,7 @@ jobs:
           name: Post process
           command: .circleci/unittest/linux/scripts/post_process.sh
       - store_test_results:
-          path: test-results
+          path: test-reports
 
   unittest_linux_gpu:
     <<: *binary_common
@@ -122,7 +113,7 @@ jobs:
           name: Post process
           command: .circleci/unittest/linux/scripts/post_process.sh
       - store_test_results:
-          path: test-results
+          path: test-reports
 
 workflows:
   unittest:

.circleci/unittest/linux/scripts/environment.yml

@@ -8,6 +8,7 @@ dependencies:
   - pip
   - ca-certificates
   - pip:
+      - xmlrunner
       - pillow>=4.1.1
       - scipy
       - av

.circleci/unittest/linux/scripts/run_test.sh

@@ -2,11 +2,15 @@
 
 set -e
 
+export IN_CI=1
+mkdir test-reports
 eval "$(./conda/bin/conda shell.bash hook)"
 conda activate ./env
 
 python -m torch.utils.collect_env
 
 # test_functorch_lagging_op_db.py: Only run this locally because it checks
 # the functorch lagging op db vs PyTorch's op db.
-find test \( -name test\*.py ! -name test_functorch_lagging_op_db.py \) | xargs -I {} -n 1 bash -c "python {} -v || exit 255"
+EXIT_STATUS=0
+find test \( -name test\*.py ! -name test_functorch_lagging_op_db.py \) | xargs -I {} -n 1 python {} -v || EXIT_STATUS=$?
+exit $EXIT_STATUS

.circleci/unittest/linux/scripts/setup_env.sh

@@ -7,8 +7,6 @@ set -e
 #
 # Do not install PyTorch and functorch here, otherwise they also get cached.
 
-set -e
-
 this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 root_dir="$(git rev-parse --show-toplevel)"
 conda_dir="${root_dir}/conda"