More fixes of timeouts.

Author: gfraiteur

.teamcity/settings.kts

@@ -38,7 +38,6 @@ object DebugBuild : BuildType({
         text("Build.Arguments", "", label = "DockerBuild.ps1 Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
         param("Build.Timeout", "30")
         text("DefaultBranch", "develop/2023.2", label = "Default Branch", description = "The default branch of this build configuration.")
-        text("Timeout", "30", label = "Time-Out", description = "Timeout, in minutes.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
     }
 
     vcs {
@@ -65,9 +64,6 @@ object DebugBuild : BuildType({
             scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage test --configuration Debug --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %Build.Arguments% -Timeout %Build.Timeout%"
         }
     }
-    failureConditions {
-       executionTimeoutMin = "%Timeout%".toInt()
-    }
 
     requirements {
         equals("env.BuildAgentType", "docker-win-x64-md")
@@ -106,7 +102,6 @@ object ReleaseBuild : BuildType({
         text("Build.Arguments", "", label = "DockerBuild.ps1 Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
         param("Build.Timeout", "30")
         text("DefaultBranch", "develop/2023.2", label = "Default Branch", description = "The default branch of this build configuration.")
-        text("Timeout", "30", label = "Time-Out", description = "Timeout, in minutes.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
     }
 
     vcs {
@@ -133,9 +128,6 @@ object ReleaseBuild : BuildType({
             scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage test --configuration Release --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %Build.Arguments% -Timeout %Build.Timeout%"
         }
     }
-    failureConditions {
-       executionTimeoutMin = "%Timeout%".toInt()
-    }
 
     requirements {
         equals("env.BuildAgentType", "docker-win-x64-md")
@@ -165,7 +157,6 @@ object PublicBuild : BuildType({
         text("Build.Arguments", "", label = "DockerBuild.ps1 Arguments", description = "Arguments to append to the 'Build' build step.", allowEmpty = true)
         param("Build.Timeout", "30")
         text("DefaultBranch", "develop/2023.2", label = "Default Branch", description = "The default branch of this build configuration.")
-        text("Timeout", "30", label = "Time-Out", description = "Timeout, in minutes.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
     }
 
     vcs {
@@ -192,9 +183,6 @@ object PublicBuild : BuildType({
             scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage test --configuration Public --buildNumber %build.number% --buildType %system.teamcity.buildType.id% %Build.Arguments% -Timeout %Build.Timeout%"
         }
     }
-    failureConditions {
-       executionTimeoutMin = "%Timeout%".toInt()
-    }
 
     requirements {
         equals("env.BuildAgentType", "docker-win-x64-md")
@@ -217,8 +205,8 @@ object PublicDeployment : BuildType({
 
     params {
         text("Publish.Arguments", "", label = "DockerBuild.ps1 Arguments", description = "Arguments to append to the 'Publish' build step.", allowEmpty = true)
+        param("Publish.Timeout", "30")
         text("DefaultBranch", "develop/2023.2", label = "Default Branch", description = "The default branch of this build configuration.")
-        text("Timeout", "30", label = "Time-Out", description = "Timeout, in minutes.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
     }
 
     vcs {
@@ -242,12 +230,9 @@ object PublicDeployment : BuildType({
                 path = "DockerBuild.ps1"
             }
             noProfile = false
-            scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage publish --configuration Public %Publish.Arguments%"
+            scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage publish --configuration Public %Publish.Arguments% -Timeout %Publish.Timeout%"
         }
     }
-    failureConditions {
-       executionTimeoutMin = "%Timeout%".toInt()
-    }
 
     requirements {
         equals("env.BuildAgentType", "docker-win-x64-md")
@@ -281,8 +266,8 @@ object VersionBump : BuildType({
 
     params {
         text("Bump.Arguments", "", label = "DockerBuild.ps1 Arguments", description = "Arguments to append to the 'Bump' build step.", allowEmpty = true)
+        param("Bump.Timeout", "15")
         text("DefaultBranch", "develop/2023.2", label = "Default Branch", description = "The default branch of this build configuration.")
-        text("Timeout", "15", label = "Time-Out", description = "Timeout, in minutes.", regex = """\d+""", validationMessage = "The timeout has to be an integer number.")
     }
 
     vcs {
@@ -306,12 +291,9 @@ object VersionBump : BuildType({
                 path = "DockerBuild.ps1"
             }
             noProfile = false
-            scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage bump %Bump.Arguments%"
+            scriptArgs = "-ImageName postsharpengineering-2023.2 -NoBuildImage bump %Bump.Arguments% -Timeout %Bump.Timeout%"
         }
     }
-    failureConditions {
-       executionTimeoutMin = "%Timeout%".toInt()
-    }
 
     requirements {
         equals("env.BuildAgentType", "docker-win-x64-md")

src/PostSharp.Engineering.BuildTools/Build/Files/TeamCitySettingsFile.cs

@@ -187,7 +187,8 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                         "publish",
                         $"--configuration {configuration}{(isStandalone ? " --standalone" : "")}",
                         true,
-                        product.DockerSpec );
+                        product.DockerSpec,
+                        configurationInfo.DeploymentTimeout ?? product.DeploymentTimeout );
 
                 if ( configurationInfo.ExportsToTeamCityDeploy )
                 {
@@ -210,7 +211,6 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                                     .Select( d => new TeamCitySnapshotDependency( d.CiConfiguration.DeploymentBuildType!, true ) ) )
                             .OrderBy( d => d.ObjectId )
                             .ToArray(),
-                        Timeout = configurationInfo.DeploymentTimeout ?? product.DeploymentTimeout,
                         IsSshAgentRequired = isRepoRemoteSsh
                     };
 
@@ -235,7 +235,6 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                             .Concat( [new TeamCitySnapshotDependency( teamCityBuildConfiguration.ObjectName, false, deployedArtifactRules )] )
                             .OrderBy( d => d.ObjectId )
                             .ToArray(),
-                        Timeout = configurationInfo.DeploymentTimeout ?? product.DeploymentTimeout,
                         IsSshAgentRequired = isRepoRemoteSsh
                     };
 
@@ -265,11 +264,17 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                     {
                         BuildSteps =
                         [
-                            new TeamCityEngineeringCommandBuildStep( "Swap", "Swap", "swap", $"--configuration {configuration}", true, product.DockerSpec )
+                            new TeamCityEngineeringCommandBuildStep(
+                                "Swap",
+                                "Swap",
+                                "swap",
+                                $"--configuration {configuration}",
+                                true,
+                                product.DockerSpec,
+                                configurationInfo.SwapTimeout ?? product.SwapTimeout )
                         ],
                         IsDeployment = true,
-                        SnapshotDependencies = swapDependencies.OrderBy( d => d.ObjectId ).ToArray(),
-                        Timeout = configurationInfo.SwapTimeout ?? product.SwapTimeout
+                        SnapshotDependencies = swapDependencies.OrderBy( d => d.ObjectId ).ToArray()
                     } );
             }
         }
@@ -292,9 +297,14 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                     {
                         BuildSteps =
                         [
-                            new TeamCityEngineeringCommandBuildStep( "Bump", "Bump", "bump", areCustomArgumentsAllowed: true, dockerSpec: product.DockerSpec )
+                            new TeamCityEngineeringCommandBuildStep(
+                                "Bump",
+                                "Bump",
+                                "bump",
+                                areCustomArgumentsAllowed: true,
+                                dockerSpec: product.DockerSpec,
+                                timeout: product.VersionBumpTimeout )
                         ],
-                        Timeout = product.VersionBumpTimeout,
                         IsSshAgentRequired = isRepoRemoteSsh
                     } );
             }
@@ -323,11 +333,11 @@ TeamCityBuildStep CreatePublishBuildStep( bool isStandalone = false )
                             "Merge downstream",
                             "tools git merge-downstream",
                             areCustomArgumentsAllowed: true,
-                            dockerSpec: product.DockerSpec )
+                            dockerSpec: product.DockerSpec,
+                            timeout: product.DownstreamMergeTimeout )
                     ],
                     SnapshotDependencies = snapshotDependencies,
                     BuildTriggers = [new SourceBuildTrigger()],
-                    Timeout = product.DownstreamMergeTimeout,
                     IsSshAgentRequired = isRepoRemoteSsh
                 } );
         }
@@ -911,7 +921,10 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
         var publicNuGetBuildCiId = $"{consolidatedProjectIdPrefix}{MarkNuGetObjectId( publicBuildObjectName )}";
         var publicNuGetDeploymentCiId = $"{consolidatedProjectIdPrefix}{MarkNuGetObjectId( publicDeploymentObjectName )}";
 
-        var nuGetPublicDeploymentSteps = new TeamCityBuildStep[] { new TeamCityEngineeringPublishBuildStep( publicConfiguration, product.DockerSpec, null ) };
+        var nuGetPublicDeploymentSteps = new TeamCityBuildStep[]
+        {
+            new TeamCityEngineeringPublishBuildStep( publicConfiguration, product.DockerSpec, product.DeploymentTimeout )
+        };
 
         // TODO: Only Public builds of dependencies that define version need to be included.
         //       Here we include all Public builds which will cause download of all artifacts.
@@ -932,10 +945,7 @@ bool TryAddPreOrPostDeploymentBuildConfiguration(
                 vcsRootId,
                 product.ResolvedBuildAgentRequirements )
             {
-                BuildSteps = nuGetPublicDeploymentSteps,
-                SnapshotDependencies = nuGetPublicDeploymentDependencies.ToArray(),
-                Timeout = product.DeploymentTimeout,
-                IsDeployment = true
+                BuildSteps = nuGetPublicDeploymentSteps, SnapshotDependencies = nuGetPublicDeploymentDependencies.ToArray(), IsDeployment = true
             } );
 
         var publicDeploymentBuildConfigurations = buildConfigurationsByKind[publicDeploymentObjectName];

src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/TeamCityBuildConfiguration.cs

@@ -44,8 +44,6 @@ internal class TeamCityBuildConfiguration
 
         public bool IsDefaultVcsRootUsed { get; init; } = true;
 
-        public TimeSpan Timeout { get; init; } = TimeSpan.FromMinutes( 30 );
-
         public TeamCityBuildConfigurationParameter[]? Parameters { get; init; }
 
         public TeamCityBuildConfiguration(
@@ -102,7 +100,6 @@ public void GenerateTeamcityCode( TextWriter writer )
 
             // Add required build steps.
             var allBuildSteps = new List<TeamCityBuildStep>();
-            var totalTimeout = this.Timeout;
 
             for ( var index = 0; index < this.BuildSteps!.Length; index++ )
             {
@@ -112,16 +109,14 @@ public void GenerateTeamcityCode( TextWriter writer )
 
                 void AddBuildStep( TeamCityBuildStep newStep )
                 {
-                    totalTimeout += newStep.AdditionalTimeout;
                     newStep.InsertPrerequisites( allBuildSteps, AddBuildStep );
                     allBuildSteps.Add( newStep );
                 }
             }
 
             var buildParameters = new List<TeamCityBuildConfigurationParameter>();
 
-            buildParameters.AddRange(
-                allBuildSteps.SelectMany( s => s.BuildConfigurationParameters ?? Enumerable.Empty<TeamCityBuildConfigurationParameter>() ) );
+            buildParameters.AddRange( allBuildSteps.SelectMany( s => s.BuildConfigurationParameters ) );
 
             buildParameters.Add(
                 new TeamCityTextBuildConfigurationParameter(
@@ -130,14 +125,6 @@ void AddBuildStep( TeamCityBuildStep newStep )
                     "The default branch of this build configuration.",
                     this.DefaultBranch ) );
 
-            var timeOutParameter = new TeamCityTextBuildConfigurationParameter(
-                "Timeout",
-                "Time-Out",
-                "Timeout, in minutes.",
-                $"{(int) totalTimeout.TotalMinutes}" ) { Validation = (@"\d+", "The timeout has to be an integer number.") };
-
-            buildParameters.Add( timeOutParameter );
-
             if ( this.Parameters != null )
             {
                 buildParameters.AddRange( this.Parameters );
@@ -200,13 +187,6 @@ void AddBuildStep( TeamCityBuildStep newStep )
                 writer.WriteLine( @"    }" );
             }
 
-            writer.WriteLine(
-                """
-                    failureConditions {
-                       executionTimeoutMin = "%Timeout%".toInt()
-                    }
-                """ );
-
             if ( !this.IsComposite && this.BuildAgentRequirements != null )
             {
                 writer.WriteLine();

src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs

@@ -32,7 +32,7 @@ public class UpdateSearchProductExtension : ProductExtension
 
     public BuildConfiguration[] BuildConfigurations { get; }
 
-    public TimeSpan TimeOutThreshold { get; }
+    public TimeSpan TimeOut { get; }
 
     public string? CustomBuildConfigurationName { get; }
 
@@ -72,7 +72,7 @@ public UpdateSearchProductExtension(
         this.Source = source;
         this.SourceUrl = sourceUrl;
         this.BuildConfigurations = buildConfigurations ?? [BuildConfiguration.Public];
-        this.TimeOutThreshold = timeOutThreshold ?? TimeSpan.FromMinutes( 30 );
+        this.TimeOut = timeOutThreshold ?? TimeSpan.FromMinutes( 30 );
         this.CustomBuildConfigurationName = customBuildConfigurationName;
         this.BuildTriggers = buildTriggers;
     }
@@ -86,7 +86,7 @@ internal override bool AddTeamcityBuildConfiguration( BuildContext context, List
     {
         TeamCityBuildStep CreateBuildStep()
         {
-            return new TeamCityEngineeringCommandBuildStep( "UpdateSearch", "Update search", "search update", null, true );
+            return new TeamCityEngineeringCommandBuildStep( "UpdateSearch", "Update search", "search update", null, true, timeout: this.TimeOut );
         }
 
         foreach ( var configuration in this.BuildConfigurations )
@@ -111,11 +111,7 @@ TeamCityBuildStep CreateBuildStep()
                 vcsRootId,
                 buildAgentRequirements )
             {
-                BuildSteps = [CreateBuildStep()],
-                IsDeployment = true,
-                SnapshotDependencies = dependencies,
-                Timeout = this.TimeOutThreshold,
-                BuildTriggers = buildTriggers
+                BuildSteps = [CreateBuildStep()], IsDeployment = true, SnapshotDependencies = dependencies, BuildTriggers = buildTriggers
             };
 
             teamCityBuildConfigurations.Add( teamCityUpdateSearchConfiguration );
@@ -128,7 +124,7 @@ TeamCityBuildStep CreateBuildStep()
                     context.Product.DependencyDefinition.Branch,
                     context.Product.DependencyDefinition.VcsRepository.DefaultBranchParameter,
                     vcsRootId,
-                    buildAgentRequirements ) { BuildSteps = [CreateBuildStep()], IsDeployment = true, Timeout = this.TimeOutThreshold };
+                    buildAgentRequirements ) { BuildSteps = [CreateBuildStep()], IsDeployment = true };
 
                 teamCityBuildConfigurations.Add( teamCityUpdateSearchWithoutDependenciesConfiguration );
             }