merging parallel dockers cpu/gpu

Author: chayim

.circleci/config.yml

@@ -43,17 +43,6 @@ commands:
               circleci step halt
             fi
 
-  setup-executor:
-    steps:
-      - run:
-          name: Setup executor
-          command: |
-            sudo apt-get -qq update
-            sudo apt-get -q install -y git openssh-client curl ca-certificates make tar gzip
-            bash <(curl -fsSL https://get.docker.com)
-#      - setup_remote_docker:
-#          docker_layer_caching: true
-
   relocate-docker-storage:
     steps:
       - run:
@@ -138,23 +127,55 @@ commands:
       - store_artifacts:
           path: tests/logs
 
-  platforms-build-steps:
+  platforms-build-steps-cpu:
     steps:
       - abort_for_docs
       - abort_for_noci
       - early_return_for_forked_pull_requests
+      - setup_remote_docker
       - checkout-all
-      - relocate-docker-storage
       - setup-automation
       - run:
           name: Build for platform
           command: |
+            bash <(curl -fsSL https://get.docker.com)
             pushd opt/build/docker
             docker login -u redisfab -p $DOCKER_REDISFAB_PWD
             for osnick in bionic xenial; do
                 make CPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
-                make GPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
                 make CPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
+                docker image prune -f
+            done
+            popd > /dev/null
+            logstar=bin/artifacts/tests-logs-cpu.tgz
+            logsdir=tests/logs/cpu
+            mkdir -p $logsdir
+            if [[ -e $logstar ]]; then tar -C $logsdir -xzf $logstar; fi
+            (cd bin/artifacts; tar -cf snapshots.tar snapshots/)
+          no_output_timeout: 40m
+      - persist_to_workspace:
+          root: bin/
+          paths:
+            - artifacts/*.zip
+            - artifacts/*.tgz
+            - artifacts/*.tar
+      - store_artifacts:
+          path: test/logs
+
+  platforms-build-steps-gpu:
+    steps:
+      - abort_for_docs
+      - abort_for_noci
+      - early_return_for_forked_pull_requests
+      - checkout-all
+      - setup-automation
+      - run:
+          name: Build for platform
+          command: |
+            pushd opt/build/docker
+            docker login -u redisfab -p $DOCKER_REDISFAB_PWD
+            for osnick in bionic xenial; do
+                make GPU=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
                 make GPU=1 LITE=1 OSNICK=$osnick ARTIFACTS=1 VERBOSE=1 build publish
                 docker image prune -f
             done
@@ -174,6 +195,7 @@ commands:
       - store_artifacts:
           path: test/logs
 
+
   deploy-steps:
     parameters:
       from:
@@ -211,14 +233,22 @@ jobs:
 
   # this build runs on a fixed machine, due to a storage need
   # nothing about it necessitates the machine itself, other than the need for more disk.
-  platforms-build:
+  platforms-build-gpu:
     machine:
       enabled: true
       docker_layer_caching: true
       resource_class: medium
       image: ubuntu-2004:202101-01
     steps:
-      - platforms-build-steps
+      - platforms-build-steps-gpu
+
+  # this build runs on a fixed machine, due to a storage need
+  # nothing about it necessitates the machine itself, other than the need for more disk.
+  platforms-build-cpu:
+    docker:
+      - image: redisfab/rmbuilder:6.2.1-x64-buster
+    steps:
+      - platforms-build-steps-cpu
 
   coverage:
     docker:
@@ -539,7 +569,8 @@ after-build-and-test: &after-build-and-test
 
 after-platform-builds: &after-platform-builds
   requires:
-    - platforms-build
+    - platforms-build-cpu
+    - platforms-build-gpu
 
 #### define workflows
 workflows:
@@ -551,7 +582,10 @@ workflows:
       - build-and-test:
           <<: *on-any-branch-but-tags
           <<: *after-linter
-      - platforms-build:
+      - platforms-build-cpu:
+          <<: *after-build-and-test
+          <<: *on-master-and-version-tags
+      - platforms-build-gpu:
           <<: *after-build-and-test
           <<: *on-master-and-version-tags
       - coverage: