diff --git a/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt b/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt index f021ec233343..759009df6c62 100644 --- a/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt +++ b/.teamcity/src/test/kotlin/CIConfigIntegrationTests.kt @@ -3,6 +3,7 @@ import common.JvmVersion import common.Os import common.VersionedSettingsBranch import configurations.BaseGradleBuildType +import configurations.GitHubMergeQueueCheckPass import jetbrains.buildServer.configs.kotlin.DslContext import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep import jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnText @@ -41,12 +42,12 @@ class CIConfigIntegrationTests { @Test fun configurationTreeCanBeGenerated() { assertEquals(rootProject.subProjects.size, model.stages.size) - assertEquals(rootProject.buildTypes.size, model.stages.size) + assertEquals(rootProject.buildTypes.size, model.stages.size + 1) // +1 for the GitHubMergeQueueCheckPass } @Test fun configurationsHaveDependencies() { - val stagePassConfigs = rootProject.buildTypes + val stagePassConfigs = rootProject.buildTypes.filter { it !is GitHubMergeQueueCheckPass } assertEquals(model.stages.size, stagePassConfigs.size) stagePassConfigs.forEach { val stageNumber = stagePassConfigs.indexOf(it) + 1