remove extended build tests

openshift · Oct 11, 2017 · 017bd6d · 017bd6d
1 parent f67aa87
commit 017bd6d
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 650 deletions.
diff --git a/pkg/build/apis/build/validation/validation_test.go b/pkg/build/apis/build/validation/validation_test.go
@@ -2890,32 +2890,6 @@ func TestValidateBuildImageRefs(t *testing.T) {
 			},
 			expectedError: "not a valid Docker pull specification: invalid reference format",
 		},
-		{
-			name: "valid s2i build w/ runtimeImage",
-			build: buildapi.Build{
-				ObjectMeta: metav1.ObjectMeta{Name: "build", Namespace: "default"},
-				Spec: buildapi.BuildSpec{
-					CommonSpec: buildapi.CommonSpec{
-						Source: buildapi.BuildSource{
-							Binary: &buildapi.BinaryBuildSource{},
-						},
-						Strategy: buildapi.BuildStrategy{
-							SourceStrategy: &buildapi.SourceBuildStrategy{
-								From: kapi.ObjectReference{
-									Kind: "DockerImage",
-									Name: "myimage:tag",
-								},
-								RuntimeImage: &kapi.ObjectReference{
-									Kind: "DockerImage",
-									Name: "runtimestream:tag",
-								},
-							},
-						},
-					},
-				},
-			},
-			expectedError: "",
-		},
 		{
 			name: "docker build with ImageStreamTag in from",
 			build: buildapi.Build{
@@ -3022,32 +2996,6 @@ func TestValidateBuildImageRefs(t *testing.T) {
 			},
 			expectedError: "Required value",
 		},
-		{
-			name: "s2i build with ImageStreamTag runtimeImage",
-			build: buildapi.Build{
-				ObjectMeta: metav1.ObjectMeta{Name: "build", Namespace: "default"},
-				Spec: buildapi.BuildSpec{
-					CommonSpec: buildapi.CommonSpec{
-						Source: buildapi.BuildSource{
-							Binary: &buildapi.BinaryBuildSource{},
-						},
-						Strategy: buildapi.BuildStrategy{
-							SourceStrategy: &buildapi.SourceBuildStrategy{
-								From: kapi.ObjectReference{
-									Kind: "DockerImage",
-									Name: "myimage:tag",
-								},
-								RuntimeImage: &kapi.ObjectReference{
-									Kind: "ImageStreamTag",
-									Name: "",
-								},
-							},
-						},
-					},
-				},
-			},
-			expectedError: "Required value",
-		},
 		{
 			name: "custom build with ImageStreamTag in from",
 			build: buildapi.Build{

diff --git a/test/extended/builds/failure_status.go b/test/extended/builds/failure_status.go
@@ -21,21 +21,18 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
 
 	var (
 		// convert the s2i failure cases to our own StatusReason
-		reasonAssembleFailed         = buildapi.StatusReason(s2istatus.ReasonAssembleFailed)
-		messageAssembleFailed        = string(s2istatus.ReasonMessageAssembleFailed)
-		reasonFetchRuntimeArtifacts  = buildapi.StatusReason(s2istatus.ReasonRuntimeArtifactsFetchFailed)
-		messageFetchRuntimeArtifacts = string(s2istatus.ReasonMessageRuntimeArtifactsFetchFailed)
-		postCommitHookFixture        = exutil.FixturePath("testdata", "statusfail-postcommithook.yaml")
-		fetchDockerSrc               = exutil.FixturePath("testdata", "statusfail-fetchsourcedocker.yaml")
-		fetchS2ISrc                  = exutil.FixturePath("testdata", "statusfail-fetchsources2i.yaml")
-		badContextDirS2ISrc          = exutil.FixturePath("testdata", "statusfail-badcontextdirs2i.yaml")
-		builderImageFixture          = exutil.FixturePath("testdata", "statusfail-fetchbuilderimage.yaml")
-		pushToRegistryFixture        = exutil.FixturePath("testdata", "statusfail-pushtoregistry.yaml")
-		fetchRuntimeArtifactsFixture = exutil.FixturePath("testdata", "statusfail-runtimeartifacts.yaml")
-		failedAssembleFixture        = exutil.FixturePath("testdata", "statusfail-failedassemble.yaml")
-		failedGenericReason          = exutil.FixturePath("testdata", "statusfail-genericreason.yaml")
-		binaryBuildDir               = exutil.FixturePath("testdata", "statusfail-assemble")
-		oc                           = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
+		reasonAssembleFailed  = buildapi.StatusReason(s2istatus.ReasonAssembleFailed)
+		messageAssembleFailed = string(s2istatus.ReasonMessageAssembleFailed)
+		postCommitHookFixture = exutil.FixturePath("testdata", "statusfail-postcommithook.yaml")
+		fetchDockerSrc        = exutil.FixturePath("testdata", "statusfail-fetchsourcedocker.yaml")
+		fetchS2ISrc           = exutil.FixturePath("testdata", "statusfail-fetchsources2i.yaml")
+		badContextDirS2ISrc   = exutil.FixturePath("testdata", "statusfail-badcontextdirs2i.yaml")
+		builderImageFixture   = exutil.FixturePath("testdata", "statusfail-fetchbuilderimage.yaml")
+		pushToRegistryFixture = exutil.FixturePath("testdata", "statusfail-pushtoregistry.yaml")
+		failedAssembleFixture = exutil.FixturePath("testdata", "statusfail-failedassemble.yaml")
+		failedGenericReason   = exutil.FixturePath("testdata", "statusfail-genericreason.yaml")
+		binaryBuildDir        = exutil.FixturePath("testdata", "statusfail-assemble")
+		oc                    = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
 	)
 
 	g.Context("", func() {
@@ -202,25 +199,6 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
 			})
 		})
 
-		g.Describe("Build status failed assemble runtime artifacts", func() {
-			g.It("should contain the failure reason related to failing to fetch runtime image artifacts", func() {
-				err := oc.Run("create").Args("-f", fetchRuntimeArtifactsFixture).Execute()
-				o.Expect(err).NotTo(o.HaveOccurred())
-
-				br, err := exutil.StartBuildAndWait(oc, "statusfail-runtimeartifacts", "--build-loglevel=5")
-				o.Expect(err).NotTo(o.HaveOccurred())
-				br.AssertFailure()
-				br.DumpLogs()
-
-				build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
-				o.Expect(err).NotTo(o.HaveOccurred())
-				o.Expect(build.Status.Reason).To(o.Equal(reasonFetchRuntimeArtifacts))
-				o.Expect(build.Status.Message).To(o.Equal(messageFetchRuntimeArtifacts))
-
-				exutil.CheckForBuildEvent(oc.KubeClient().Core(), br.Build, buildapi.BuildFailedEventReason, buildapi.BuildFailedEventMessage)
-			})
-		})
-
 		g.Describe("Build status failed https proxy invalid url", func() {
 			g.It("should contain the generic failure reason and message", func() {
 				err := oc.Run("create").Args("-f", failedGenericReason).Execute()

diff --git a/test/extended/builds/s2i_extended_build.go b/test/extended/builds/s2i_extended_build.go