From 9793510dca0ad13ea11f719569c5a80549a7da4b Mon Sep 17 00:00:00 2001
From: Sally MacFarlane <macfarla.github@gmail.com>
Date: Mon, 8 Jan 2024 10:53:32 +1000
Subject: [PATCH] change order of AT tasks

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
---
 .circleci/config.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bcd81e45cbe..325b7994692 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ executors:
     resource_class: xlarge
     working_directory: ~/project
     environment:
-      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4 -XX:+HeapDumpOnOutOfMemoryError
 
   xl_machine_executor:
     machine: #https://circleci.com/developer/machine/image/ubuntu-2204
@@ -227,7 +227,7 @@ jobs:
               | sed 's/.\{5\}$//' \
               | circleci tests split --split-by=timings --timings-type=classname)
             # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') \
             ./gradlew --no-daemon acceptanceTestMainnet $GRADLE_ARGS
       - capture_test_results
       - capture_test_logs
@@ -239,7 +239,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Clique + BFT)
           no_output_timeout: 20m
           command: |
             ./gradlew --no-daemon acceptanceTestCliqueBft
@@ -254,7 +254,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Privacy)
           no_output_timeout: 20m
           command: |
             CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
@@ -263,7 +263,7 @@ jobs:
               | sed 's/.\{5\}$//' \
               | circleci tests split --split-by=timings --timings-type=classname)
             # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') \
             ./gradlew --no-daemon acceptanceTestPrivacy $GRADLE_ARGS
       - capture_test_results
       - capture_test_logs
@@ -275,7 +275,7 @@ jobs:
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests (Non-Mainnet)
+          name: AcceptanceTests (Permissioning)
           no_output_timeout: 20m
           command: |
             ./gradlew --no-daemon acceptanceTestPermissioning
@@ -409,12 +409,14 @@ workflows:
       - unitTests:
            requires:
             - assemble
+            - acceptanceTests
       - testWindows:
           requires:
             - assemble
       - referenceTests:
           requires:
             - assemble
+            - acceptanceTests
       - integrationTests:
           requires:
             - assemble
@@ -424,11 +426,11 @@ workflows:
       - acceptanceTestsCliqueBft:
           requires:
             - assemble
-            - acceptanceTests
+            - acceptanceTestsPermissioning
       - acceptanceTestsPermissioning:
           requires:
+            - acceptanceTests
             - assemble
-            - acceptanceTestsCliqueBft
       - buildDocker:
           requires:
             - assemble