also test arm fips

Author: shreyamalpani

.gitlab/scripts/poll_e2e.sh

@@ -29,7 +29,7 @@ while true; do
         continue
     fi
     RESPONSE=$(cat /tmp/e2e_response.json)
-    E2E_JOB_STATUS=$(echo "$RESPONSE" | jq -r '.[] | select(.name=="e2e-test (arm64)") | .downstream_pipeline.status')
+    E2E_JOB_STATUS=$(echo "$RESPONSE" | jq -r --arg name "$E2E_JOB_NAME" '.[] | select(.name==$name) | .downstream_pipeline.status')
     echo -n "E2E job status: $E2E_JOB_STATUS, "
     if [ "$E2E_JOB_STATUS" == "success" ]; then
         echo "E2E tests completed successfully"

.gitlab/templates/pipeline.yaml.tpl

@@ -231,7 +231,7 @@ publish layer [self-monitoring] ({{ $flavor.name }}):
 {{ end }}  # end flavors
 
 {{ range $f := (ds "flavors").flavors }}
-{{ if and $f.needs_layer_publish (eq $f.arch "arm64") (not $f.fips) }}
+{{ if and $f.needs_layer_publish (eq $f.arch "arm64") }}
 {{- $dotenvE2E := printf "%s_sandbox_e2e.env" $f.suffix }}
 {{ with $environment := (ds "environments").environments.sandbox }}
 
@@ -287,11 +287,13 @@ e2e-test ({{ $f.name }}):
     EXTENSION_VERSION: $EXTENSION_LAYER_ARN
     ARCHITECTURE: {{ $f.arch }}
 
-e2e-test-status:
+e2e-test-status ({{ $f.name }}):
   stage: e2e
   image: registry.ddbuild.io/images/docker:20.10-py3
   tags: ["arch:amd64"]
   timeout: 3h
+  variables:
+    E2E_JOB_NAME: "e2e-test ({{ $f.name }})"
   script:
     - .gitlab/scripts/poll_e2e.sh