Merge branch 'master' into jb/declarative-dsl/improve-exception-handling

.teamcity/README.md

@@ -32,8 +32,8 @@ test these changes without affecting `master`/`release` pipeline. Here are the i
   - Suppose the VCS root you just create is `MyNewVcsRoot`. Set "default branch" to `myTestBranch` where your code exists.
 - Click `Create subproject` button at the bottom of the "Subprojects" region of [this page](https://builds.gradle.org/admin/editProject.html?projectId=Gradle&tab=projectGeneralTab)
   - Select `Manually`.
-  - Give it a name. The name will be displayed on TeamCity web UI, we highly recommend it to be capitalized from branch name, i.e. `MyTestBranch`.
-  - The project ID will be auto generated as `Gradle_MyTestBranch`. If not, you probably selected wrong parent, the "Parent project" should be `Gradle`.
+  - Give it a name. The name will be displayed on TeamCity web UI. We highly recommend it be capitalized from the branch name, i.e. `MyTestBranch`.
+  - The project ID will be auto-generated as `Gradle_MyTestBranch`. If not, you probably selected wrong parent, the "Parent project" should be `Gradle`.
 - Now click on the new project you just created. The URL should be `https://builds.gradle.org/admin/editProject.html?projectId=Gradle_<MyTestBranch>`.
 - Click `Versioned Settings` on the left sidebar.
   - Select `Synchronization enabled` - `use settings from VCS` - `MyNewVcsRoot`(the one you just created) - `Settings format: Kotlin`, then `Apply`.

.teamcity/performance-tests-ci.json

@@ -786,6 +786,29 @@
         "per_commit" : [ "linux" ]
       }
     } ]
+  }, {
+    "testId" : "org.gradle.performance.regression.java.JavaIDETaskExecutionPerformanceTest.run compileJava via Tooling API",
+    "groups" : [ {
+      "testProject" : "largeAndroidBuild",
+      "coverage" : {
+        "per_commit" : [ "linux" ]
+      }
+    }, {
+      "testProject" : "largeJavaMultiProject",
+      "coverage" : {
+        "per_commit" : [ "linux" ]
+      }
+    }, {
+      "testProject" : "largeJavaMultiProjectHierarchy",
+      "coverage" : {
+        "per_commit" : [ "linux" ]
+      }
+    }, {
+      "testProject" : "nowInAndroidBuild",
+      "coverage" : {
+        "per_commit" : [ "linux" ]
+      }
+    } ]
   }, {
     "testId" : "org.gradle.performance.regression.java.JavaIncrementalExecutionPerformanceTest.assemble for abi change",
     "groups" : [ {

.teamcity/src/main/kotlin/common/extensions.kt

@@ -155,7 +155,9 @@ fun javaHome(jvm: Jvm, os: Os, arch: Arch = Arch.AMD64) = "%${os.name.lowercase(
 fun BuildType.paramsForBuildToolBuild(buildJvm: Jvm = BuildToolBuildJvm, os: Os, arch: Arch = Arch.AMD64) {
     params {
         param("env.BOT_TEAMCITY_GITHUB_TOKEN", "%github.bot-teamcity.token%")
+        param("env.GRADLE_CACHE_REMOTE_PASSWORD", "%gradle.cache.remote.password%")
         param("env.GRADLE_CACHE_REMOTE_URL", "%gradle.cache.remote.url%")
+        param("env.GRADLE_CACHE_REMOTE_USERNAME", "%gradle.cache.remote.username%")
 
         param("env.JAVA_HOME", javaHome(buildJvm, os, arch))
         param("env.GRADLE_OPTS", "-Xmx1536m")

.teamcity/subprojects.json

@@ -349,6 +349,13 @@
     "functionalTests": true,
     "crossVersionTests": false
   },
+  {
+    "name": "execution-e2e-tests",
+    "path": "platforms/core-execution/execution-e2e-tests",
+    "unitTests": false,
+    "functionalTests": true,
+    "crossVersionTests": false
+  },
   {
     "name": "file-collections",
     "path": "platforms/core-configuration/file-collections",