separating build process

newrelic · Jan 21, 2025 · 21e9e29 · 21e9e29
1 parent a047924
commit 21e9e29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml
@@ -1,7 +1,7 @@
 name: E2E Test Workflow For Firehose
 
 on:
-  push:
+  pull_request:
     branches:
       - main
       - develop
@@ -37,5 +37,6 @@ jobs:
           NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }}
         run: |
           cd e2e_tests/
+          ./build_template.sh
           ./firehose_e2e_tests.sh ${{ matrix.test-case }}
 
diff --git a/e2e_tests/build_template.sh b/e2e_tests/build_template.sh
@@ -0,0 +1,7 @@
+#Building and deploying the changes
+BASE_NAME=$(basename "$TEMPLATE_FILE_NAME" .yaml)
+BUILD_DIR="$BUILD_DIR_BASE/$BASE_NAME"
+
+# Build and package the SAM template
+sam build --template-file "../$TEMPLATE_FILE_NAME" --build-dir "$BUILD_DIR"
+sam package --s3-bucket "$S3_BUCKET" --template-file "$BUILD_DIR/template.yaml" --output-template-file "$BUILD_DIR/$TEMPLATE_FILE_NAME"
diff --git a/e2e_tests/firehose_e2e_tests.sh b/e2e_tests/firehose_e2e_tests.sh
@@ -153,17 +153,8 @@ COMMON_ATTRIBUTES=$(<common_attribute.json)
   # Delete the Firehose stack
   delete_stack "$FIREHOSE_STACK_NAME_4"
 }
-
-
-
-BASE_NAME=$(basename "$TEMPLATE_FILE_NAME" .yaml)
-BUILD_DIR="$BUILD_DIR_BASE/$BASE_NAME"
-
-# Build and package the SAM template
-sam build --template-file "../$TEMPLATE_FILE_NAME" --build-dir "$BUILD_DIR"
-sam package --s3-bucket "$S3_BUCKET" --template-file "$BUILD_DIR/template.yaml" --output-template-file "$BUILD_DIR/$TEMPLATE_FILE_NAME"
 
-Run the test cases
+#Run the test cases
 case $1 in
   test-without-filter)
     test_logs_without_filter_pattern