Merge pull request #4194 from storybooks/remove-cli-shapshots

Remove snapshots part of CLI tests
storybookjs · Sep 18, 2018 · 4afdbb5 · 4afdbb5
2 parents 115a2fc + 6240230
commit 4afdbb5
Show file tree

Hide file tree

Showing 327 changed files with 12 additions and 10,373 deletions.
diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -25,7 +25,6 @@ object Project : Project({
     buildType(OpenSourceProjects_Storybook_Docs)
     buildType(OpenSourceProjects_Storybook_Build_2)
     buildType(OpenSourceProjects_Storybook_CliTest)
-    buildType(OpenSourceProjects_Storybook_CliSmokeTest)
     buildType(OpenSourceProjects_Storybook_Test)
     buildType(OpenSourceProjects_Storybook_Lint)
     buildType(OpenSourceProjects_Storybook_Lint_Warnings)

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
@@ -37,7 +37,6 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
         }
         retryBuild {
             delaySeconds = 60
-            enabled = false
         }
     }
 
@@ -106,5 +105,10 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
         }
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_CliTest) {
+            snapshot {
+                onDependencyCancel = FailureAction.ADD_PROBLEM
+            }
+        }
     }
 })
diff --git a/...city/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliSmokeTest.kt b/...city/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliSmokeTest.kt
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt
@@ -21,6 +21,8 @@ object OpenSourceProjects_Storybook_CliTest : BuildType({
         script {
             name = "Bootstrap"
             scriptContent = """
+                set -e -x
+
                 yarn
                 yarn bootstrap --core
             """.trimIndent()
@@ -33,20 +35,6 @@ object OpenSourceProjects_Storybook_CliTest : BuildType({
         }
     }
 
-    triggers {
-        vcs {
-            quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
-            triggerRules = "-:comment=^TeamCity change:**"
-            branchFilter = """
-                +:pull/*
-                +:release/*
-                +:master
-                +:dependencies.io-*
-            """.trimIndent()
-        }
-        retryBuild {}
-    }
-
     features {
         commitStatusPublisher {
             publisher = github {

diff --git a/.../OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts b/.../OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts
diff --git a/lib/cli/test/fixtures/already_has_storybook/.gitignore b/lib/cli/test/fixtures/already_has_storybook/.gitignore
diff --git a/lib/cli/test/fixtures/already_has_storybook/.storybook/addons.js b/lib/cli/test/fixtures/already_has_storybook/.storybook/addons.js
diff --git a/lib/cli/test/fixtures/already_has_storybook/.storybook/config.js b/lib/cli/test/fixtures/already_has_storybook/.storybook/config.js