From c8183c0bca5b9cbff5adec2a19bf2a19ac4edeed Mon Sep 17 00:00:00 2001
From: Khai Do <zaro0508@gmail.com>
Date: Wed, 17 Jan 2024 08:17:53 -0800
Subject: [PATCH] Fix integration tests

* Integration tests were failing because it was being run
  in the eu-west-1 region.  The CONTRIBUTING.md[1] doc
  clearly states that integration tests are setup to run
  in eu-west-* region.

* Slightly modified the CI workflow to not run integration
  tests until all other tests have executed.

[1] https://github.com/Sceptre/sceptre/blob/master/CONTRIBUTING.md#integration-tests
---
 .github/workflows/main.yaml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 92cd621f3..923dd90b2 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -80,7 +80,11 @@ jobs:
           context: .
   integration-tests:
     needs:
+      - linting
+      - packaging
+      - documentation
       - unit-tests
+      - docker-build
     if: ${{ github.ref_type == 'push' }}
     runs-on: ubuntu-latest
     permissions:
@@ -111,9 +115,8 @@ jobs:
         run: AWS_DEFAULT_REGION=eu-west-1 poetry run behave integration-tests/features --junit --junit-directory build/behave
   docker-build-push:
     needs:
-      - docker-build
       - integration-tests
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ (github.ref_type == 'push') && (github.ref == 'refs/heads/master') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -133,13 +136,6 @@ jobs:
           tags: sceptreorg/sceptre:${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
   docker-build-release:
-    needs:
-      - linting
-      - packaging
-      - documentation
-      - unit-tests
-      - docker-build
-      - integration-tests
     if: ${{ github.ref_type == 'tag' }}
     runs-on: ubuntu-latest
     steps:
@@ -167,13 +163,6 @@ jobs:
           tags: sceptreorg/sceptre:${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
   pypi-release:
-    needs:
-      - linting
-      - packaging
-      - documentation
-      - unit-tests
-      - docker-build
-      - integration-tests
     if: ${{ github.ref_type == 'tag' }}
     runs-on: ubuntu-latest
     steps: