🐛🏗 Actually actually actually fix gracefully halt for abbreviated exp…

…eriments (#35385)

.circleci/config.yml

@@ -17,6 +17,15 @@ push_builds_only: &push_builds_only
         - main
         - /^amp-release-.*$/
 
+experiment_job: &experiment_job
+  parameters:
+    exp:
+      description: 'Which of the three (A/B/C) experiments to use'
+      type: enum
+      enum: ['A', 'B', 'C']
+  environment:
+    EXP: << parameters.exp >>
+
 executors:
   amphtml-small-executor:
     docker:
@@ -287,11 +296,7 @@ jobs:
   'Experiment Build':
     executor:
       name: amphtml-xlarge-executor
-    parameters:
-      exp:
-        description: 'Which of the three (A/B/C) experiments to use'
-        type: enum
-        enum: ['A', 'B', 'C']
+    <<: *experiment_job
     steps:
       - setup_vm
       - run:
@@ -302,11 +307,7 @@ jobs:
   'Experiment Integration Tests':
     executor:
       name: amphtml-large-executor
-    parameters:
-      exp:
-        description: 'Which of the three (A/B/C) experiments to use'
-        type: enum
-        enum: ['A', 'B', 'C']
+    <<: *experiment_job
     steps:
       - setup_vm
       - install_chrome
@@ -319,11 +320,7 @@ jobs:
   'Experiment End-to-End Tests':
     executor:
       name: amphtml-large-executor
-    parameters:
-      exp:
-        description: 'Which of the three (A/B/C) experiments to use'
-        type: enum
-        enum: ['A', 'B', 'C']
+    <<: *experiment_job
     parallelism: 6
     steps:
       - setup_vm

.circleci/maybe_gracefully_halt.sh

@@ -29,10 +29,7 @@ if ls /tmp/restored-workspace/.CI_GRACEFULLY_HALT_* 1>/dev/null 2>&1; then
   exit 0
 fi
 
-if [[ $CIRCLE_JOB =~ Exp(eriment|\.) ]]; then
-  # Extract the experiment name from the job name in `config.yml`.
-  EXP=$(echo $CIRCLE_JOB | awk '{print $2}')
-
+if [[ $EXP ]]; then
   # Extract the commit SHA. For PR jobs, this is written to .CIRCLECI_MERGE_COMMIT.
   if [[ -f /tmp/restored-workspace/.CIRCLECI_MERGE_COMMIT ]]; then
     COMMIT_SHA="$(cat /tmp/restored-workspace/.CIRCLECI_MERGE_COMMIT)"