From a2b073719f30a0e1bb30106aa8a6e7f104b2ac99 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Thu, 23 May 2019 11:36:53 +0200
Subject: [PATCH] [CI] Use executors

---
 .circleci/config.yml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef94e869..45974a3d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,13 +6,17 @@ version: 2.1
 orbs:
   anchore: anchore/anchore-engine@1.3.0
 
-jobs:
-  build:
-    working_directory: ~/src
+executors:
+  docker_executor:
     docker:
       - image: hbpmip/docker-compose-for-ci:18.09-5
+    working_directory: ~/src
     environment:
-       - CIRCLECI: true
+      - CIRCLECI: true
+
+jobs:
+  build:
+    executor: docker_executor
     steps:
       - setup_remote_docker:
           version: 18.06.0-ce
@@ -50,22 +54,20 @@ jobs:
       - store_artifacts:
           path: test-results/
           destination: test-results
+      - persist_to_workspace:
+          root: /root/src
+          paths: tests/
 
   integration_tests:
-    docker:
-      - image: hbpmip/docker-compose-for-ci:18.09-5
-    environment:
-       - CIRCLECI: true
+    executor: docker_executor
     steps:
       - setup_remote_docker:
           version: 18.06.0-ce
-      - checkout
-      - restore_cache:
-          keys:
-            - pre-commit-dot-cache-$CACHE_VERSION-{{ checksum ".pre-commit-config.yaml" }}
+      - attach_workspace:
+          at: /root/src
       - run:
           name: "Run integration tests"
-          command: ./tests/ci.sh --all
+          command: /root/src/tests/ci.sh --all
       - store_test_results:
           path: test-results/
       - store_artifacts:
@@ -78,14 +80,11 @@ jobs:
           path: logs/
           destination: logs
 
+  # TODO: not really using the latest image built
   security_checks:
     executor: anchore/anchore_engine
     steps:
       - setup_remote_docker
-      - checkout
-      - run:
-          name: "Build the project"
-          command: ./build.sh
       - anchore/analyze_local_image:
           image_name: hbpmip/woken:latest
           timeout: '500'