From d241c74389c8a248338044090ea149651a7ed8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Czoma?= <balazs.czoma@solace.com>
Date: Wed, 24 Jul 2024 10:58:03 -0400
Subject: [PATCH] Moved up broker create to stabilize before test

---
 .github/workflows/broker-build-test.yml       | 19 +++++++++++--------
 .../module-test-pipeline-main-branch-only.yml | 12 ++++++------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/broker-build-test.yml b/.github/workflows/broker-build-test.yml
index 751995f..3f976d2 100644
--- a/.github/workflows/broker-build-test.yml
+++ b/.github/workflows/broker-build-test.yml
@@ -62,34 +62,37 @@ jobs:
           echo "No changes detected, skipping further steps"          
 
       - name: List changed files - from now on all tests are run only if there were changes
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           echo "Changed files: ${{ steps.check-changed-files.outputs.changed_files }}"
           git diff
 
-      - name: Set up Terraform latest
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_wrapper: false
-
       - name: Setup Test broker
-        # if: steps.check-changed-files.outputs.files_changed == 'true'
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
           docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
             --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
+      - name: Set up Terraform latest
+        if: steps.check-changed-files.outputs.files_changed == 'true'
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_wrapper: false
+
       - name: Test module from template on test broker
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           ci/scripts/test-module.sh ci/template-test
 
       - name: Test module root on test broker
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           ci/scripts/test-module.sh ci/module-test
 
       - name: Test examples
+        if: steps.check-changed-files.outputs.files_changed == 'true'
         run: |
           shopt -s extglob
           for d in examples/!(basic-client-username)/; do (ci/scripts/test-module.sh "$d"); done
diff --git a/.github/workflows/module-test-pipeline-main-branch-only.yml b/.github/workflows/module-test-pipeline-main-branch-only.yml
index 44459e5..184836c 100644
--- a/.github/workflows/module-test-pipeline-main-branch-only.yml
+++ b/.github/workflows/module-test-pipeline-main-branch-only.yml
@@ -13,12 +13,6 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Terraform latest - with token
-        uses: hashicorp/setup-terraform@v3
-        with:
-          cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
-          terraform_wrapper: true
-
       - name: Setup test broker
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
@@ -26,6 +20,12 @@ jobs:
             --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
+      - name: Set up Terraform latest - with token
+        uses: hashicorp/setup-terraform@v3
+        with:
+          cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
+          terraform_wrapper: true
+
       - name: Test module root on test broker
         run: |
           ci/scripts/test-module.sh ci/module-test