ci: fix 241 integ / 251 ui classpath issues (#5502)

rli · web-flow · commit e1cf1557751d · 2025-03-26T08:38:35.000-07:00
integ / ui failing due to missing / conflicting classpath issues
    251 ui failing since useRelease filters out non-release builds
diff --git a/buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-integration-testing.gradle.kts
@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {
         task {
             integrationTestConfiguration(this)
         }
+
+        // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+        prepareSandboxTask {
+            disabledPlugins.add("com.intellij.swagger")
+        }
     }
 } ?: run {
     val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)
diff --git a/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts b/buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
@@ -3,6 +3,7 @@
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -103,7 +104,8 @@ dependencies {
     }
 }
 
-tasks.prepareTestSandbox {
+// https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844
+tasks.withType<PrepareSandboxTask>().configureEach {
     disabledPlugins.addAll(
         "com.intellij.swagger",
         "org.jetbrains.plugins.kotlin.jupyter",
diff --git a/ui-tests-starter/.gitignore b/ui-tests-starter/.gitignore
@@ -1 +1,3 @@
 allure-results/
+package.json
+package-lock.json
diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts
@@ -38,6 +38,7 @@ intellijPlatform {
 }
 
 val uiTestImplementation by configurations.getting
+val uiTestRuntimeOnly by configurations.getting
 
 configurations.getByName(uiTestSource.compileClasspathConfigurationName) {
     extendsFrom(uiTestImplementation)
@@ -53,6 +54,9 @@ dependencies {
     uiTestImplementation(platform(libs.junit5.bom))
     uiTestImplementation(libs.junit5.jupiter)
 
+    // not sure why not coming in transitively for starter
+    uiTestRuntimeOnly(libs.kotlin.coroutines)
+
     intellijPlatform {
         val version = ideProfile.community.sdkVersion
         intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt
@@ -46,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {
             LocalProjectInfo(
                 Paths.get("tstData", "Hello")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
         Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")
             .createParentDirectories()
             .writeText(
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/chatTests/AmazonQChatTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/chatTests/AmazonQChatTest.kt
@@ -58,7 +58,7 @@ class AmazonQChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "Hello")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeTest.kt
@@ -65,7 +65,7 @@ class CreateReadmeTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "createFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -101,7 +101,7 @@ class CreateReadmeTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "createFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -137,7 +137,7 @@ class CreateReadmeTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "createFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -173,7 +173,7 @@ class CreateReadmeTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "createFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -218,7 +218,7 @@ class CreateReadmeTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "createFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeLatestChangesTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeLatestChangesTest.kt
@@ -63,7 +63,7 @@ class UpdateReadmeLatestChangesTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "updateFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -101,7 +101,7 @@ class UpdateReadmeLatestChangesTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "updateFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -139,7 +139,7 @@ class UpdateReadmeLatestChangesTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "updateFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeSpecificChangesTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/updateReadmeTests/UpdateReadmeSpecificChangesTest.kt
@@ -62,7 +62,7 @@ class UpdateReadmeSpecificChangesTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "updateFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -100,7 +100,7 @@ class UpdateReadmeSpecificChangesTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qdoc", "updateFlow")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/featureDevTests/FeatureDevTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/featureDevTests/FeatureDevTest.kt
@@ -68,7 +68,7 @@ class FeatureDevTest {
             LocalProjectInfo(
                 Paths.get("tstData", "FeatureDevE2ETestFolder")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -100,7 +100,7 @@ class FeatureDevTest {
             LocalProjectInfo(
                 Paths.get("tstData", "FeatureDevE2ETestFolder")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -132,7 +132,7 @@ class FeatureDevTest {
             LocalProjectInfo(
                 Paths.get("tstData", "FeatureDevE2ETestFolder")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -164,7 +164,7 @@ class FeatureDevTest {
             LocalProjectInfo(
                 Paths.get("tstData", "FeatureDevE2ETestFolder")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -196,7 +196,7 @@ class FeatureDevTest {
             LocalProjectInfo(
                 Paths.get("tstData", "FeatureDevE2ETestFolder")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/testTests/QTestGenerationChatTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/testTests/QTestGenerationChatTest.kt
@@ -57,7 +57,7 @@ class QTestGenerationChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qTestGenerationTestProject")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -89,7 +89,7 @@ class QTestGenerationChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qTestGenerationTestProject/")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -123,7 +123,7 @@ class QTestGenerationChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qTestGenerationTestProject/")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
@@ -155,7 +155,7 @@ class QTestGenerationChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "qTestGenerationTestProject/")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt
@@ -123,7 +123,7 @@ class TransformChatTest {
             LocalProjectInfo(
                 Paths.get("tstData", "Hello")
             )
-        ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))
+        ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))
 
         // inject connection
         useExistingConnectionForTest()

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,11 @@ extensions.findByType<IntelliJPlatformTestingExtension>()?.let {`
`79`	`79`	`task {`
`80`	`80`	`integrationTestConfiguration(this)`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1844`
	`84`	`+ prepareSandboxTask {`
	`85`	`+ disabledPlugins.add("com.intellij.swagger")`
	`86`	`+ }`
`82`	`87`	`}`
`83`	`88`	`} ?: run {`
`84`	`89`	`val integrationTest by tasks.registering(Test::class, integrationTestConfiguration)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`allure-results/`
	`2`	`+package.json`
	`3`	`+package-lock.json`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class OfflineAmazonQInlineCompletionTest {`
`46`	`46`	`LocalProjectInfo(`
`47`	`47`	`Paths.get("tstData", "Hello")`
`48`	`48`	`)`
`49`		`- ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))`
	`49`	`+ ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))`
`50`	`50`	`Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json")`
`51`	`51`	`.createParentDirectories()`
`52`	`52`	`.writeText(`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class AmazonQChatTest {`
`58`	`58`	`LocalProjectInfo(`
`59`	`59`	`Paths.get("tstData", "Hello")`
`60`	`60`	`)`
`61`		`- ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))`
	`61`	`+ ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))`
`62`	`62`
`63`	`63`	`// inject connection`
`64`	`64`	`useExistingConnectionForTest()`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ class TransformChatTest {`
`123`	`123`	`LocalProjectInfo(`
`124`	`124`	`Paths.get("tstData", "Hello")`
`125`	`125`	`)`
`126`		`- ).useRelease(System.getProperty("org.gradle.project.ideProfileName"))`
	`126`	`+ ).withVersion(System.getProperty("org.gradle.project.ideProfileName"))`
`127`	`127`
`128`	`128`	`// inject connection`
`129`	`129`	`useExistingConnectionForTest()`