Merge pull request #5395 from JetBrains/playground/e2e-local

feat(ci): run production test in CI for any branch

Author: zoobestik

.teamcity/common/E2ERunner.kt

@@ -0,0 +1,22 @@
+package common
+
+import jetbrains.buildServer.configs.kotlin.BuildStep
+import jetbrains.buildServer.configs.kotlin.BuildType
+import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
+
+open class E2ERunner(init: BuildType.() -> Unit) : BuildType({
+    artifactRules = """
+        +:test-results/* => test-results.zip
+    """.trimIndent()
+
+    params {
+        param("env.WEBTEAM_UI_NPM_TOKEN", "%WEBTEAM_UI_NPM_TOKEN%")
+        param("env.CI", "true")
+    }
+
+    vcs {
+        root(vcsRoots.KotlinLangOrg)
+    }
+
+    init()
+})

.teamcity/tests/buildTypes/E2EProductionTest.kt

@@ -1,22 +1,18 @@
 package tests.buildTypes
 
+import common.E2ERunner
 import common.extensions.isProjectPlayground
-import jetbrains.buildServer.configs.kotlin.BuildType
 import jetbrains.buildServer.configs.kotlin.buildFeatures.notifications
 import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.triggers.schedule
 
 
-object E2EProductionTest : BuildType({
+object E2EProductionTest : E2ERunner({
     name = "E2E Test in Production"
 
-    artifactRules = """
-        +:test-results/* => test-results.zip
-    """.trimIndent()
-
-    vcs {
-        root(vcsRoots.KotlinLangOrg)
+    params {
+        param("env.BASE_URL", "https://kotlinlang.org")
     }
 
     triggers {
@@ -38,9 +34,11 @@ object E2EProductionTest : BuildType({
 
     steps {
         script {
+            name = "Run E2E tests"
+            // language=sh
             scriptContent = """
                 yarn install --immutable
-                yarn test:production:ci
+                yarn test:ci
             """.trimIndent()
             dockerImage = "mcr.microsoft.com/playwright:v1.57.0"
             dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux

.teamcity/tests/buildTypes/E2ETests.kt

@@ -1,85 +1,34 @@
 package tests.buildTypes
 
-import documentation.builds.KotlinWithCoroutines
-import jetbrains.buildServer.configs.kotlin.BuildType
+import common.E2ERunner
 import jetbrains.buildServer.configs.kotlin.FailureAction
 import jetbrains.buildServer.configs.kotlin.buildSteps.script
-import kotlinlang.builds.BuildJsAssets
-import references.builds.kotlinx.coroutines.KotlinxCoroutinesBuildApiReference
-import references.builds.kotlinx.serialization.KotlinxSerializationBuildApiReference
+import kotlinlang.builds.BuildSitePages
 
+object E2ETests : E2ERunner({
+    name = "E2E Branch tests"
 
-object E2ETests : BuildType({
-    name = "E2E tests"
-
-    artifactRules = """
-        +:test-results/* => test-results.zip
-    """.trimIndent()
-
-    vcs {
-        root(vcsRoots.KotlinLangOrg)
+    requirements {
+        exists("docker.server.version")
     }
 
     dependencies {
-        artifacts(KotlinWithCoroutines) {
-            cleanDestination = true
-            artifactRules = """
-                +:webHelpImages.zip!** => dist/docs/images/
-                +:webHelpKR2.zip!** => dist/docs/
-            """.trimIndent()
-        }
-
-        dependency(BuildJsAssets) {
+        dependency(BuildSitePages) {
             snapshot {
                 onDependencyFailure = FailureAction.FAIL_TO_START
                 onDependencyCancel = FailureAction.CANCEL
             }
-
-            artifacts {
-                artifactRules = "+:assets.zip!** => _assets/"
-            }
-        }
-
-        dependency(KotlinxCoroutinesBuildApiReference) {
-            snapshot {
-                onDependencyFailure = FailureAction.CANCEL
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
-            artifacts {
-                artifactRules = "+:pages.zip!** => libs/kotlinx.coroutines/"
-            }
-        }
-
-        dependency(KotlinxSerializationBuildApiReference) {
-            snapshot {
-                onDependencyFailure = FailureAction.CANCEL
-                onDependencyCancel = FailureAction.CANCEL
-            }
-
             artifacts {
-                artifactRules = "+:pages.zip!** => libs/kotlinx.serialization/"
+                buildRule = sameChainOrLastFinished()
+                artifactRules = "+:pages.zip!** => dist/"
             }
         }
     }
 
     steps {
-        script {
-            name = "Set execute permissions"
-            scriptContent = "chmod +x ./scripts/test/run-e2e-tests.sh"
-        }
         script {
             name = "Run E2E tests"
-            scriptContent = "./scripts/test/run-e2e-tests.sh"
+            scriptContent = "./scripts/run-e2e-tests.sh"
         }
     }
-
-    artifactRules = """
-        +:test-results/ => test-results/
-    """.trimIndent()
-
-    requirements {
-        exists("docker.server.version")
-        contains("docker.server.osType", "linux")
-    }
 })

docker-compose-e2e-statics.yml

@@ -1,34 +1,33 @@
-version: '3'
 services:
-  nginx-server:
-    build:
-      context: .
-      dockerfile: ./dockerfiles/nginx-server/Dockerfile
-    ports:
-      - 8081:80
+  reverse-proxy:
+    image: nginx:stable-alpine
     networks:
-      - network1
+      - test-network
+    volumes:
+      - ./dist:/usr/share/nginx/html
     healthcheck:
-        test: [ "CMD", "curl", "-f", "http://localhost" ]
-        interval: 30s
-        timeout: 10s
-        retries: 3
+      test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost" ]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+    logging:
+      driver: "none"
 
   playwright:
-    build:
-      context: .
-      dockerfile: ./dockerfiles/playwright/Dockerfile
-    command: yarn run test:e2e:ci
+    image: mcr.microsoft.com/playwright:v1.57.0-noble
     environment:
-      BASE_URL: "http://nginx-server"
+      BASE_URL: "http://reverse-proxy"
+      WEBTEAM_UI_NPM_TOKEN: ${WEBTEAM_UI_NPM_TOKEN}
+      CI: ${CI}
+    working_dir: /var/www
     volumes:
-      - ./test/snapshots:/var/www/test/snapshots
-      - ./test-results:/var/www/test-results
+      - .:/var/www
+    command: sh -c "yarn install --immutable && yarn run test:ci"
     depends_on:
-      nginx-server:
+      reverse-proxy:
         condition: service_healthy
     networks:
-      - network1
+      - test-network
 
 networks:
-  network1:
+  test-network:

dockerfiles/e2e-tests/Dockerfile

@@ -137,10 +137,7 @@
         "generate-redirects": "node scripts/generate-redirect-pages.js",
         "lint": "next lint",
         "test": "playwright test test",
-        "test:production": "playwright test test/production",
-        "test:production:ci": "CI=true BASE_URL=https://kotlinlang.org playwright test test/production",
-        "test:production:headed": "playwright test test/production --headed --project=chromium",
-        "test:production:debug": "PWDEBUG=1 playwright test test/production --project=chromium",
+        "test:ci": "playwright test test/production",
         "test:e2e": "playwright test test/e2e",
         "test:e2e:ci": "CI=true playwright test test/e2e",
         "test:e2e:headed": "playwright test test/e2e --headed",