Merge branch 'master' into feature/dependabot

microsoft · Sep 27, 2024 · 05ece50 · 05ece50
2 parents 9ad7093 + 23233ae
commit 05ece50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Agent.Sdk/Knob/AgentKnobs.cs b/src/Agent.Sdk/Knob/AgentKnobs.cs
@@ -661,11 +661,11 @@ public class AgentKnobs
             new RuntimeKnobSource("AZP_AGENT_CHECK_FOR_TASK_DEPRECATION"),
             new BuiltInDefaultKnobSource("false"));
 
-        public static readonly Knob CheckIfTaskNodeRunnerIsDeprecated = new Knob(
-            nameof(CheckIfTaskNodeRunnerIsDeprecated),
+        public static readonly Knob CheckIfTaskNodeRunnerIsDeprecated246 = new Knob(
+            nameof(CheckIfTaskNodeRunnerIsDeprecated246),
             "If true, the agent will check in the 'Initialize job' step each task used in the job if this task has node handlers, and all of them are deprecated.",
-            new RuntimeKnobSource("AZP_AGENT_CHECK_IF_TASK_NODE_RUNNER_IS_DEPRECATED"),
-            new PipelineFeatureSource("CheckIfTaskNodeRunnerIsDeprecated"),
+            new RuntimeKnobSource("AZP_AGENT_CHECK_IF_TASK_NODE_RUNNER_IS_DEPRECATED_246"),
+            new PipelineFeatureSource("CheckIfTaskNodeRunnerIsDeprecated246"),
             new BuiltInDefaultKnobSource("false"));
 
         public static readonly Knob UseNode20ToStartContainer = new Knob(

diff --git a/src/Agent.Worker/TaskManager.cs b/src/Agent.Worker/TaskManager.cs
@@ -93,7 +93,7 @@ into taskGrouping
                     CheckForTaskDeprecation(executionContext, task);
                 }
 
-                if (AgentKnobs.CheckIfTaskNodeRunnerIsDeprecated.GetValue(executionContext).AsBoolean())
+                if (AgentKnobs.CheckIfTaskNodeRunnerIsDeprecated246.GetValue(executionContext).AsBoolean())
                 {
                     if (!exceptionList.Contains(task.Id))
                     {