test

Signed-off-by: Charlie Truong <[email protected]>

Author: chtruong814

.github/workflows/azure-queue-events.yaml

@@ -120,9 +120,9 @@ jobs:
                   print("No GitHub token available to cancel other workers")
                   return
 
-              # Get current run ID and job ID
+              # Get current run ID and worker ID
               run_id = os.environ.get('GITHUB_RUN_ID')
-              current_job_id = os.environ['JOB_ID']
+              current_worker = os.environ.get('WORKER_ID')
 
               headers = {
                   'Authorization': f'token {token}',
@@ -134,10 +134,25 @@ jobs:
               response = requests.get(url, headers=headers)
               if response.status_code == 200:
                   jobs = response.json()['jobs']
+                  current_job = None
+
+                  # Find current job by matrix variables
+                  for job in jobs:
+                      if (job['name'].startswith('read-events') and
+                          'matrix' in job and
+                          'worker' in job['matrix'] and
+                          str(job['matrix']['worker']) == current_worker):
+                          current_job = job
+                          break
+
+                  if not current_job:
+                      print(f"Could not find current job for worker {current_worker}")
+                      return
+
+                  # Cancel other read-events jobs
                   for job in jobs:
-                      # Only cancel other read-events jobs that are in progress
                       if (job['name'].startswith('read-events') and
-                          job['id'] != int(current_job_id) and
+                          job['id'] != current_job['id'] and
                           job['status'] in ['queued', 'in_progress']):
                           cancel_url = f"{url}/{job['id']}/cancel"
                           cancel_response = requests.post(cancel_url, headers=headers)