From d7ae7ca911eb2c58c91add4ca896f0a3bdc73d84 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 29 Oct 2021 17:32:27 +0200
Subject: [PATCH] Ensure all test tasks is finalized by 'cleanTestKitCacheTask'
 on CI.

^KT-45745 In Progress
---
 .../build.gradle.kts                                 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index cd722365c30..48a046f2d22 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -176,6 +176,8 @@ val allParallelTestsTask = tasks.register<Test>("kgpAllParallelTests") {
         excludeTags("DaemonsKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 val simpleTestsTask = tasks.register<Test>("kgpSimpleTests") {
@@ -187,6 +189,8 @@ val simpleTestsTask = tasks.register<Test>("kgpSimpleTests") {
         includeTags("SimpleKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 val jvmTestsTask = tasks.register<Test>("kgpJvmTests") {
@@ -197,6 +201,8 @@ val jvmTestsTask = tasks.register<Test>("kgpJvmTests") {
         includeTags("JvmKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 val jsTestsTask = tasks.register<Test>("kgpJsTests") {
@@ -207,6 +213,8 @@ val jsTestsTask = tasks.register<Test>("kgpJsTests") {
         includeTags("JsKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 // Daemon tests could run only sequentially as they could not be shared between parallel test builds
@@ -221,6 +229,8 @@ val daemonsTestsTask = tasks.register<Test>("kgpDaemonTests") {
         includeTags("DaemonsKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 val otherPluginsTestTask = tasks.register<Test>("kgpOtherTests") {
@@ -231,6 +241,8 @@ val otherPluginsTestTask = tasks.register<Test>("kgpOtherTests") {
         includeTags("OtherKGP")
         includeEngines("junit-jupiter")
     }
+
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 tasks.named<Task>("check") {