Revert "adding web_e2e tests to framework tests (#234)" This reverts commit f97e9aadbb10816c5d5ac557805b28a9d08077d6.
diff --git a/config/framework_config.star b/config/framework_config.star index c45b910..7bf906d 100644 --- a/config/framework_config.star +++ b/config/framework_config.star
@@ -262,21 +262,6 @@ ], ) common.linux_prod_builder( - name = "Linux%s web_e2e_test|web_e2e" % ("" if branch == "master" else " " + branch), - recipe = new_recipe_name, - console_view_name = console_view_name, - triggered_by = [trigger_name], - triggering_policy = triggering_policy, - properties = { - "validation": "web_e2e_test", - "validation_name": "Web e2e tests", - "dependencies": [{"dependency": "chrome_and_driver"}], - }, - caches = [ - swarming.cache(name = "pub_cache", path = ".pub_cache"), - ], - ) - common.linux_prod_builder( name = "Linux%s web_smoke_test|web_smk" % ("" if branch == "master" else " " + branch), recipe = new_recipe_name, console_view_name = console_view_name, @@ -291,6 +276,7 @@ swarming.cache(name = "pub_cache", path = ".pub_cache"), ], ) + common.linux_prod_builder( name = "Linux%s build_gallery|dg" % ("" if branch == "master" else " " + branch), recipe = new_recipe_name, @@ -644,20 +630,6 @@ ], ) common.linux_try_builder( - name = "Linux web_e2e_test|web_e2e", - recipe = "flutter/flutter", - repo = repos.FLUTTER, - list_view_name = list_view_name, - properties = { - "validation": "web_e2e_test", - "validation_name": "Web e2e tests", - "dependencies": [{"dependency": "chrome_and_driver"}], - }, - caches = [ - swarming.cache(name = "pub_cache", path = ".pub_cache"), - ], - ) - common.linux_try_builder( name = "Linux web_smoke_test|web_smk", recipe = "flutter/flutter", repo = repos.FLUTTER,
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg index abc06d4..61bcb79 100644 --- a/config/generated/flutter/luci/cr-buildbucket.cfg +++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -1878,44 +1878,6 @@ task_template_canary_percentage {} } builders { - name: "Linux beta web_e2e_test" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cores:8" - dimensions: "cpu:x64" - dimensions: "os:Linux" - dimensions: "pool:luci.flutter.prod" - recipe { - name: "flutter/flutter_1_22_0" - cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes" - cipd_version: "refs/heads/master" - properties_j: "$fuchsia/goma:{\"server\":\"rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog\"}" - properties_j: "$kitchen:{\"emulate_gce\":true}" - properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}" - properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}" - properties_j: "clobber:false" - properties_j: "dependencies:[{\"dependency\":\"chrome_and_driver\"}]" - properties_j: "fuchsia_ctl_version:\"version:0.0.23\"" - properties_j: "gold_tryjob:false" - properties_j: "goma_jobs:\"200\"" - properties_j: "mastername:\"client.flutter\"" - properties_j: "upload_packages:true" - properties_j: "validation:\"web_e2e_test\"" - properties_j: "validation_name:\"Web e2e tests\"" - } - execution_timeout_secs: 10800 - caches { - name: "flutter_openjdk_install" - path: "java" - } - caches { - name: "pub_cache" - path: ".pub_cache" - } - build_numbers: YES - service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage {} - } - builders { name: "Linux beta web_integration_tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" @@ -3562,44 +3524,6 @@ task_template_canary_percentage {} } builders { - name: "Linux dev web_e2e_test" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cores:8" - dimensions: "cpu:x64" - dimensions: "os:Linux" - dimensions: "pool:luci.flutter.prod" - recipe { - name: "flutter/flutter" - cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes" - cipd_version: "refs/heads/master" - properties_j: "$fuchsia/goma:{\"server\":\"rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog\"}" - properties_j: "$kitchen:{\"emulate_gce\":true}" - properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}" - properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}" - properties_j: "clobber:false" - properties_j: "dependencies:[{\"dependency\":\"chrome_and_driver\"}]" - properties_j: "fuchsia_ctl_version:\"version:0.0.23\"" - properties_j: "gold_tryjob:false" - properties_j: "goma_jobs:\"200\"" - properties_j: "mastername:\"client.flutter\"" - properties_j: "upload_packages:true" - properties_j: "validation:\"web_e2e_test\"" - properties_j: "validation_name:\"Web e2e tests\"" - } - execution_timeout_secs: 10800 - caches { - name: "flutter_openjdk_install" - path: "java" - } - caches { - name: "pub_cache" - path: ".pub_cache" - } - build_numbers: YES - service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage {} - } - builders { name: "Linux dev web_integration_tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" @@ -5811,44 +5735,6 @@ task_template_canary_percentage {} } builders { - name: "Linux stable web_e2e_test" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cores:8" - dimensions: "cpu:x64" - dimensions: "os:Linux" - dimensions: "pool:luci.flutter.prod" - recipe { - name: "flutter/flutter_1_20_0" - cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes" - cipd_version: "refs/heads/master" - properties_j: "$fuchsia/goma:{\"server\":\"rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog\"}" - properties_j: "$kitchen:{\"emulate_gce\":true}" - properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}" - properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}" - properties_j: "clobber:false" - properties_j: "dependencies:[{\"dependency\":\"chrome_and_driver\"}]" - properties_j: "fuchsia_ctl_version:\"version:0.0.23\"" - properties_j: "gold_tryjob:false" - properties_j: "goma_jobs:\"200\"" - properties_j: "mastername:\"client.flutter\"" - properties_j: "upload_packages:true" - properties_j: "validation:\"web_e2e_test\"" - properties_j: "validation_name:\"Web e2e tests\"" - } - execution_timeout_secs: 10800 - caches { - name: "flutter_openjdk_install" - path: "java" - } - caches { - name: "pub_cache" - path: ".pub_cache" - } - build_numbers: YES - service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage {} - } - builders { name: "Linux stable web_integration_tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" @@ -6050,44 +5936,6 @@ task_template_canary_percentage {} } builders { - name: "Linux web_e2e_test" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cores:8" - dimensions: "cpu:x64" - dimensions: "os:Linux" - dimensions: "pool:luci.flutter.prod" - recipe { - name: "flutter/flutter" - cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes" - cipd_version: "refs/heads/master" - properties_j: "$fuchsia/goma:{\"server\":\"rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog\"}" - properties_j: "$kitchen:{\"emulate_gce\":true}" - properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}" - properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}" - properties_j: "clobber:false" - properties_j: "dependencies:[{\"dependency\":\"chrome_and_driver\"}]" - properties_j: "fuchsia_ctl_version:\"version:0.0.23\"" - properties_j: "gold_tryjob:false" - properties_j: "goma_jobs:\"200\"" - properties_j: "mastername:\"client.flutter\"" - properties_j: "upload_packages:true" - properties_j: "validation:\"web_e2e_test\"" - properties_j: "validation_name:\"Web e2e tests\"" - } - execution_timeout_secs: 10800 - caches { - name: "flutter_openjdk_install" - path: "java" - } - caches { - name: "pub_cache" - path: ".pub_cache" - } - build_numbers: YES - service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage {} - } - builders { name: "Linux web_integration_tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8" @@ -17064,44 +16912,6 @@ task_template_canary_percentage {} } builders { - name: "Linux web_e2e_test" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cores:8" - dimensions: "cpu:x64" - dimensions: "os:Linux" - dimensions: "pool:luci.flutter.try" - recipe { - name: "flutter/flutter" - cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes" - cipd_version: "refs/heads/master" - properties_j: "$fuchsia/goma:{\"server\":\"rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog\"}" - properties_j: "$kitchen:{\"emulate_gce\":true}" - properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}" - properties_j: "$recipe_engine/swarming:{\"server\":\"https://chromium-swarm.appspot.com\"}" - properties_j: "clobber:false" - properties_j: "dependencies:[{\"dependency\":\"chrome_and_driver\"}]" - properties_j: "fuchsia_ctl_version:\"version:0.0.23\"" - properties_j: "gold_tryjob:true" - properties_j: "goma_jobs:\"200\"" - properties_j: "mastername:\"client.flutter\"" - properties_j: "upload_packages:false" - properties_j: "validation:\"web_e2e_test\"" - properties_j: "validation_name:\"Web e2e tests\"" - } - execution_timeout_secs: 10800 - caches { - name: "flutter_openjdk_install" - path: "java" - } - caches { - name: "pub_cache" - path: ".pub_cache" - } - build_numbers: YES - service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com" - task_template_canary_percentage {} - } - builders { name: "Linux web_integration_tests" swarming_host: "chromium-swarm.appspot.com" dimensions: "cores:8"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg index 1b813f2..f05fd70 100644 --- a/config/generated/flutter/luci/luci-milo.cfg +++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -1639,11 +1639,6 @@ short_name: "pcache" } builders { - name: "buildbucket/luci.flutter.prod/Linux stable web_e2e_test" - category: "Linux" - short_name: "web_e2e" - } - builders { name: "buildbucket/luci.flutter.prod/Linux stable web_smoke_test" category: "Linux" short_name: "web_smk" @@ -1757,11 +1752,6 @@ short_name: "pcache" } builders { - name: "buildbucket/luci.flutter.prod/Linux beta web_e2e_test" - category: "Linux" - short_name: "web_e2e" - } - builders { name: "buildbucket/luci.flutter.prod/Linux beta web_smoke_test" category: "Linux" short_name: "web_smk" @@ -1875,11 +1865,6 @@ short_name: "pcache" } builders { - name: "buildbucket/luci.flutter.prod/Linux dev web_e2e_test" - category: "Linux" - short_name: "web_e2e" - } - builders { name: "buildbucket/luci.flutter.prod/Linux dev web_smoke_test" category: "Linux" short_name: "web_smk" @@ -1988,11 +1973,6 @@ short_name: "pcache" } builders { - name: "buildbucket/luci.flutter.prod/Linux web_e2e_test" - category: "Linux" - short_name: "web_e2e" - } - builders { name: "buildbucket/luci.flutter.prod/Linux web_smoke_test" category: "Linux" short_name: "web_smk" @@ -2086,9 +2066,6 @@ name: "buildbucket/luci.flutter.try/Linux fuchsia_precache" } builders { - name: "buildbucket/luci.flutter.try/Linux web_e2e_test" - } - builders { name: "buildbucket/luci.flutter.try/Linux web_smoke_test" } builders {
diff --git a/config/generated/flutter/luci/luci-notify.cfg b/config/generated/flutter/luci/luci-notify.cfg index b4be259..c6b80b4 100644 --- a/config/generated/flutter/luci/luci-notify.cfg +++ b/config/generated/flutter/luci/luci-notify.cfg
@@ -484,17 +484,6 @@ } builders { bucket: "prod" - name: "Linux beta web_e2e_test" - repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" - } -} -notifiers { - notifications { - on_new_failure: true - notify_blamelist {} - } - builders { - bucket: "prod" name: "Linux beta web_integration_tests" repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" } @@ -924,17 +913,6 @@ } builders { bucket: "prod" - name: "Linux dev web_e2e_test" - repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" - } -} -notifiers { - notifications { - on_new_failure: true - notify_blamelist {} - } - builders { - bucket: "prod" name: "Linux dev web_integration_tests" repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" } @@ -1518,17 +1496,6 @@ } builders { bucket: "prod" - name: "Linux stable web_e2e_test" - repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" - } -} -notifiers { - notifications { - on_new_failure: true - notify_blamelist {} - } - builders { - bucket: "prod" name: "Linux stable web_integration_tests" repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" } @@ -1584,17 +1551,6 @@ } builders { bucket: "prod" - name: "Linux web_e2e_test" - repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" - } -} -notifiers { - notifications { - on_new_failure: true - notify_blamelist {} - } - builders { - bucket: "prod" name: "Linux web_integration_tests" repository: "https://chromium.googlesource.com/external/github.com/flutter/flutter" }
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg index 2d96b7d..3f9163d 100644 --- a/config/generated/flutter/luci/luci-scheduler.cfg +++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -597,20 +597,6 @@ } } job { - id: "Linux beta web_e2e_test" - acl_sets: "prod" - triggering_policy { - kind: GREEDY_BATCHING - max_concurrent_invocations: 3 - max_batch_size: 1 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.flutter.prod" - builder: "Linux beta web_e2e_test" - } -} -job { id: "Linux beta web_integration_tests" acl_sets: "prod" triggering_policy { @@ -1150,20 +1136,6 @@ } } job { - id: "Linux dev web_e2e_test" - acl_sets: "prod" - triggering_policy { - kind: GREEDY_BATCHING - max_concurrent_invocations: 3 - max_batch_size: 1 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.flutter.prod" - builder: "Linux dev web_e2e_test" - } -} -job { id: "Linux dev web_integration_tests" acl_sets: "prod" triggering_policy { @@ -1899,20 +1871,6 @@ } } job { - id: "Linux stable web_e2e_test" - acl_sets: "prod" - triggering_policy { - kind: GREEDY_BATCHING - max_concurrent_invocations: 3 - max_batch_size: 1 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.flutter.prod" - builder: "Linux stable web_e2e_test" - } -} -job { id: "Linux stable web_integration_tests" acl_sets: "prod" triggering_policy { @@ -1983,20 +1941,6 @@ } } job { - id: "Linux web_e2e_test" - acl_sets: "prod" - triggering_policy { - kind: GREEDY_BATCHING - max_concurrent_invocations: 3 - max_batch_size: 3 - } - buildbucket { - server: "cr-buildbucket.appspot.com" - bucket: "luci.flutter.prod" - builder: "Linux web_e2e_test" - } -} -job { id: "Linux web_integration_tests" acl_sets: "prod" triggering_policy { @@ -5024,7 +4968,6 @@ triggers: "Linux beta framework_tests" triggers: "Linux beta fuchsia_precache" triggers: "Linux beta tool_tests" - triggers: "Linux beta web_e2e_test" triggers: "Linux beta web_integration_tests" triggers: "Linux beta web_smoke_test" triggers: "Linux beta web_tests" @@ -5152,7 +5095,6 @@ triggers: "Linux dev framework_tests" triggers: "Linux dev fuchsia_precache" triggers: "Linux dev tool_tests" - triggers: "Linux dev web_e2e_test" triggers: "Linux dev web_integration_tests" triggers: "Linux dev web_smoke_test" triggers: "Linux dev web_tests" @@ -5353,7 +5295,6 @@ triggers: "Linux framework_tests" triggers: "Linux fuchsia_precache" triggers: "Linux tool_tests" - triggers: "Linux web_e2e_test" triggers: "Linux web_integration_tests" triggers: "Linux web_smoke_test" triggers: "Linux web_tests" @@ -5469,7 +5410,6 @@ triggers: "Linux stable framework_tests" triggers: "Linux stable fuchsia_precache" triggers: "Linux stable tool_tests" - triggers: "Linux stable web_e2e_test" triggers: "Linux stable web_integration_tests" triggers: "Linux stable web_smoke_test" triggers: "Linux stable web_tests"