Merge branch 'main' into fix-bucketconfig-comparison

microsoft · Sep 14, 2022 · 1a02882 · 1a02882
2 parents fa40448 + bb81f2e
commit 1a02882
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,9 @@ jobs:
       matrix:
         os:
         - [ self-hosted, "1ES.Pool=onefuzz-ci", "1ES.ImageOverride=github-runner-image-windows-2019" ]
-        - [ self-hosted, "1ES.Pool=onefuzz-ci", "1ES.ImageOverride=github-runner-image-ubuntu-18.04" ] 
+        # disabled while issue is affecting instances
+        #- [ self-hosted, "1ES.Pool=onefuzz-ci", "1ES.ImageOverride=github-runner-image-ubuntu-18.04" ] 
+        - ubuntu-18.04
     runs-on: "${{ matrix.os }}"
     steps:
     - uses: actions/checkout@v2

diff --git a/src/ApiService/ApiService/onefuzzlib/TaskOperations.cs b/src/ApiService/ApiService/onefuzzlib/TaskOperations.cs
@@ -133,7 +133,7 @@ private async Async.Task MarkDependantsFailed(Task task, List<Task>? taskInJob =
 
         foreach (var t in taskInJob) {
             if (t.Config.PrereqTasks != null) {
-                if (t.Config.PrereqTasks.Contains(t.TaskId)) {
+                if (t.Config.PrereqTasks.Contains(task.TaskId)) {
                     await MarkFailed(t, new Error(ErrorCode.TASK_FAILED, new[] { $"prerequisite task failed.  task_id:{t.TaskId}" }), taskInJob);
                 }
             }