refactor

Author: jchrostek-dd

.gitlab/templates/pipeline.yaml.tpl

@@ -431,8 +431,8 @@ publish integration layer (arm64):
     - echo "Published layer ARN - ${LAYER_ARN}"
   {{ end }}
 
-# Integration Tests - Deploy CDK stacks with commit hash prefix (parallel by test suite)
-integration-deploy-suite:
+# Integration Tests - Deploy, test, and cleanup each suite independently (parallel by test suite)
+integration-suite:
   stage: integration-tests
   tags: ["arch:amd64"]
   image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
@@ -455,6 +455,7 @@ integration-deploy-suite:
   variables:
     IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
     AWS_DEFAULT_REGION: us-east-1
+    DD_SITE: datadoghq.com
   {{ with $environment := (ds "environments").environments.sandbox }}
   before_script:
     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
@@ -464,68 +465,23 @@ integration-deploy-suite:
     - npm ci
   {{ end }}
   script:
+    # Deploy
     - echo "Deploying ${TEST_SUITE} CDK stack with identifier ${IDENTIFIER}..."
     - export EXTENSION_LAYER_ARN=$(aws lambda list-layer-versions --layer-name "Datadog-Extension-ARM-${CI_COMMIT_SHORT_SHA}" --query 'LayerVersions[0].LayerVersionArn' --output text --region us-east-1)
     - echo "Using integration test layer - ${EXTENSION_LAYER_ARN}"
     - export CDK_DEFAULT_ACCOUNT=$(aws sts get-caller-identity --query Account --output text)
     - export CDK_DEFAULT_REGION=us-east-1
     - npm run build
     - npx cdk deploy "integ-${IDENTIFIER}-${TEST_SUITE}" --require-approval never
-
-# Integration Tests - Run Jest test suite (parallel by test suite)
-integration-test-suite:
-  stage: integration-tests
-  tags: ["arch:amd64"]
-  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
-  parallel:
-    matrix:
-      - TEST_SUITE: [base, otlp]
-  rules:
-    - when: on_success
-  needs:
-    - integration-deploy-suite
-  variables:
-    IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
-    DD_SITE: datadoghq.com
-  {{ with $environment := (ds "environments").environments.sandbox }}
-  before_script:
-    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
-    - curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
-    - apt-get install -y nodejs
-    - cd integration-tests
-    - npm ci
-  script:
+    # Test
     - echo "Running ${TEST_SUITE} integration tests with identifier ${IDENTIFIER}..."
     - export TEST_SUITE=${TEST_SUITE}
     - npx jest tests/${TEST_SUITE}.test.ts
-  {{ end }}
-  artifacts:
-    when: always
-    paths:
-      - integration-tests/test-results/
-    reports:
-      junit: integration-tests/test-results/junit-*.xml
-    expire_in: 30 days
-
-# Integration Tests - Cleanup stacks (parallel by test suite)
-integration-cleanup-suite:
-  stage: integration-tests
-  tags: ["arch:amd64"]
-  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
-  parallel:
-    matrix:
-      - TEST_SUITE: [base, otlp]
-  rules:
-    - when: always
-  needs:
-    - integration-test-suite
-  variables:
-    IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
   {{ with $environment := (ds "environments").environments.sandbox }}
-  before_script:
+  after_script:
+    # Re-authenticate for cleanup (after_script runs in new shell)
     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
-  {{ end }}
-  script:
+    # Cleanup - always runs even if tests fail
     - echo "Destroying ${TEST_SUITE} CDK stack with identifier ${IDENTIFIER}..."
     - |
       STACK_NAME="integ-${IDENTIFIER}-${TEST_SUITE}"
@@ -548,6 +504,14 @@ integration-cleanup-suite:
 
         echo "${TEST_SUITE} stack deleted successfully"
       fi
+  {{ end }}
+  artifacts:
+    when: always
+    paths:
+      - integration-tests/test-results/
+    reports:
+      junit: integration-tests/test-results/junit-*.xml
+    expire_in: 30 days
 
 # Integration Tests - Cleanup layer
 integration-cleanup-layer:
@@ -557,7 +521,7 @@ integration-cleanup-layer:
   rules:
     - when: always
   needs:
-    - job: integration-cleanup-suite
+    - job: integration-suite
   variables:
     IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
   {{ with $environment := (ds "environments").environments.sandbox }}