Merge pull request #14720 from coreydaley/github_14390_tests_for_buil…

…d_phase_error

Merged by openshift-bot

test/extended/builds/build_pruning.go

@@ -18,6 +18,7 @@ var _ = g.Describe("[builds][pruning] prune builds based on settings in the buil
 		isFixture             = filepath.Join(buildPruningBaseDir, "imagestream.yaml")
 		successfulBuildConfig = filepath.Join(buildPruningBaseDir, "successful-build-config.yaml")
 		failedBuildConfig     = filepath.Join(buildPruningBaseDir, "failed-build-config.yaml")
+		erroredBuildConfig    = filepath.Join(buildPruningBaseDir, "errored-build-config.yaml")
 		oc                    = exutil.NewCLI("build-pruning", exutil.KubeConfigPath())
 	)
 
@@ -119,4 +120,33 @@ var _ = g.Describe("[builds][pruning] prune builds based on settings in the buil
 		o.Expect(int32(len(builds.Items))).To(o.Equal(*buildConfig.Spec.FailedBuildsHistoryLimit), "there should be %v canceled builds left after pruning, but instead there were %v", *buildConfig.Spec.FailedBuildsHistoryLimit, len(builds.Items))
 
 	})
+
+	g.It("should prune errored builds based on the failedBuildsHistoryLimit setting", func() {
+
+		g.By("creating test failed build config")
+		err := oc.Run("create").Args("-f", erroredBuildConfig).Execute()
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("starting three test builds")
+		br, _ := exutil.StartBuildAndWait(oc, "myphp")
+		br.AssertFailure()
+		br, _ = exutil.StartBuildAndWait(oc, "myphp")
+		br.AssertFailure()
+		br, _ = exutil.StartBuildAndWait(oc, "myphp")
+		br.AssertFailure()
+
+		buildConfig, err := oc.Client().BuildConfigs(oc.Namespace()).Get("myphp", metav1.GetOptions{})
+		if err != nil {
+			fmt.Fprintf(g.GinkgoWriter, "%v", err)
+		}
+
+		builds, err := oc.Client().Builds(oc.Namespace()).List(metav1.ListOptions{})
+		if err != nil {
+			fmt.Fprintf(g.GinkgoWriter, "%v", err)
+		}
+
+		o.Expect(int32(len(builds.Items))).To(o.Equal(*buildConfig.Spec.FailedBuildsHistoryLimit), "there should be %v failed builds left after pruning, but instead there were %v", *buildConfig.Spec.FailedBuildsHistoryLimit, len(builds.Items))
+
+	})
+
 })

test/extended/testdata/build-pruning/errored-build-config.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: BuildConfig
+metadata:
+  name: myphp
+spec:
+  failedBuildsHistoryLimit: 2
+  source:
+    type: Git
+    git:
+      uri: 'https://github.com/openshift/cakephp-ex.git'
+      ref: master
+  strategy:
+    type: Source
+    sourceStrategy:
+      env:
+        - name: FIELDREF_ENV
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.nofield
+      from:
+        kind: ImageStreamTag
+        namespace: openshift
+        name: 'php:7.0'