fix integration tests

.github/workflows/main.yaml

@@ -9,12 +9,12 @@ env:
 on:
   push:
     branches:
-      - 'master'
+      - '*'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+([0-9]+)'
   pull_request:
     branches:
-      - 'master'
+      - '*'
 
 jobs:
   linting:
@@ -78,45 +78,45 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-
-# temporarily comment out to get GH action into place.  Will fix tests on a follow on PR.
-# https://github.com/Sceptre/sceptre/pull/1412#discussion_r1452566731
-#  integration-tests:
-#    needs:
-#      - unit-tests
-#    if: ${{ github.event_name != 'pull_request' }}
-#    runs-on: ubuntu-latest
-#    permissions:
-#      id-token: write
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Install Poetry
-#        uses: snok/install-poetry@v1
-#      - name: Install dependencies
-#        run: poetry install --no-interaction --all-extras
-#      # Update poetry for https://github.com/python-poetry/poetry/issues/7184
-#      - name: update poetry
-#        run: poetry self update --no-ansi
-#      - name: Setup Python
-#        id: setup-python
-#        uses: actions/setup-python@v5
-#        with:
-#          python-version: '3.10'
-#          cache: 'poetry'
-#      - name: Assume AWS role
-#        uses: aws-actions/configure-aws-credentials@v4
-#        with:
-#          aws-region: ${{ env.AWS_REGION }}
-#          role-to-assume: ${{ env.AWS_ROLE }}
-#          role-session-name: GHA-${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ github.run_id }}
-#          role-duration-seconds: ${{ env.AWS_ROLE_DURATION }}
-#      - name: run tests
-#        run: poetry run behave integration-tests/features --junit --junit-directory build/behave
-
-  docker-build-push:
+  integration-tests:
     needs:
+      - linting
+      - packaging
+      - documentation
+      - unit-tests
       - docker-build
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.ref_type == 'push' }}
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+      - name: Install dependencies
+        run: poetry install --no-interaction --all-extras
+      # Update poetry for https://github.com/python-poetry/poetry/issues/7184
+      - name: update poetry
+        run: poetry self update --no-ansi
+      - name: Setup Python
+        id: setup-python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+          cache: 'poetry'
+      - name: Assume AWS role
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: ${{ env.AWS_REGION }}
+          role-to-assume: ${{ env.AWS_ROLE }}
+          role-session-name: GHA-${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ github.run_id }}
+          role-duration-seconds: ${{ env.AWS_ROLE_DURATION }}
+      - name: run tests
+        run: AWS_DEFAULT_REGION=eu-west-1 poetry run behave integration-tests/features --junit --junit-directory build/behave
+  docker-build-push:
+    needs:
+      - integration-tests
+    if: ${{ (github.ref_type == 'push') && (github.ref == 'refs/heads/master') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -136,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:
@@ -170,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: