Merge branch 'development' into feat-halo

dash-project · Apr 24, 2018 · 2c8ba56 · 2c8ba56
2 parents a5d493e + 4f2ac4f
commit 2c8ba56
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,101 @@
+version: 2
+jobs:
+  gnu_mpich:
+    docker:
+      - image: dashproject/ci:mpich
+    environment:
+      GTEST_FILTER: "-TeamLocalityTest*"
+      DASH_MAKE_PROCS: 2
+      DASH_MAX_UNITS: 4
+      DASH_BUILDEX: OFF
+      CC: gcc
+      CXX: g++
+    steps:
+      - checkout
+      - run: bash dash/scripts/dash-ci.sh Release
+      - run: bash dash/scripts/dash-ci.sh Minimal
+      - run:
+          command: bash dash/scripts/circleci/collect-artifacts.sh
+          when: always
+      - store_artifacts:
+          path: /tmp/build-logs
+      - store_test_results:
+          path: /tmp/build-tests
+
+  gnu_openmpi2:
+    docker:
+      - image: dashproject/ci:openmpi2
+    environment:
+      MPI_EXEC_FLAGS: "--allow-run-as-root --map-by core"
+      GTEST_FILTER: "-TeamLocalityTest*"
+      DASH_MAKE_PROCS: 2
+      DASH_MAX_UNITS: 4
+      DASH_BUILDEX: OFF
+      CC: gcc
+      CXX: g++
+    steps:
+      - checkout
+      - run: bash dash/scripts/dash-ci.sh Release
+      - run: bash dash/scripts/dash-ci.sh Minimal
+      - run:
+          command: bash dash/scripts/circleci/collect-artifacts.sh
+          when: always
+      - store_artifacts:
+          path: /tmp/build-logs
+      - store_test_results:
+          path: /tmp/build-tests
+
+  gnu_openmpi3:
+    docker:
+      - image: dashproject/ci:openmpi3
+    environment:
+      MPI_EXEC_FLAGS: "--allow-run-as-root --map-by core"
+      GTEST_FILTER: "-TeamLocalityTest*"
+      DASH_MAKE_PROCS: 2
+      DASH_MAX_UNITS: 4
+      DASH_BUILDEX: OFF
+      CC: gcc
+      CXX: g++
+    steps:
+      - checkout
+      - run: bash dash/scripts/dash-ci.sh Release
+      - run: bash dash/scripts/dash-ci.sh Minimal
+      - run:
+          command: bash dash/scripts/circleci/collect-artifacts.sh
+          when: always
+      - store_artifacts:
+          path: /tmp/build-logs
+      - store_test_results:
+          path: /tmp/build-tests
+
+  clang_mpich:
+    docker:
+      - image: dashproject/ci:mpich
+    environment:
+      GTEST_FILTER: "-TeamLocalityTest*"
+      DASH_MAKE_PROCS: 2
+      DASH_MAX_UNITS: 4
+      DASH_BUILDEX: OFF
+      CC: clang-3.8
+      CXX: clang++-3.8
+    steps:
+      - checkout
+      - run: bash dash/scripts/dash-ci.sh Release
+      - run: bash dash/scripts/dash-ci.sh Minimal
+      - run:
+          command: bash dash/scripts/circleci/collect-artifacts.sh
+          when: always
+      - store_artifacts:
+          path: /tmp/build-logs
+      - store_test_results:
+          path: /tmp/build-tests
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - gnu_mpich
+      - gnu_openmpi2
+      - gnu_openmpi3
+      - clang_mpich
+
diff --git a/circle.yml b/circle.yml
diff --git a/dash/scripts/circleci/collect-artifacts.sh b/dash/scripts/circleci/collect-artifacts.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Copy Build artifacts to tmp directory to collect them later using circleci
+
+[[ "$CIRCLECI" == "true" ]] || { echo "Not running on CircleCI"; exit 1; }
+
+mkdir -p /tmp/build-logs/${CIRCLE_JOB}
+mkdir -p /tmp/build-tests/${CIRCLE_JOB}
+
+cd build-ci
+
+echo "Collect Logs"
+cp -v --parents -R ./*/*/*/*.log /tmp/build-logs/${CIRCLE_JOB}
+echo "Artifacts copied to /tmp/build-logs/${CIRCLE_JOB}"
+
+echo "Collect Tests"
+cp -v --parents -R ./*/*/*/dash-tests-*.xml /tmp/build-tests/${CIRCLE_JOB}
+echo "Testlogs copied to /tmp/build-tests/${CIRCLE_JOB}"
+