Skip to content

Commit 017bd6d

Browse files
committed
remove extended build tests
1 parent f67aa87 commit 017bd6d

10 files changed

+12
-650
lines changed

pkg/build/apis/build/validation/validation_test.go

-52
Original file line numberDiff line numberDiff line change
@@ -2890,32 +2890,6 @@ func TestValidateBuildImageRefs(t *testing.T) {
28902890
},
28912891
expectedError: "not a valid Docker pull specification: invalid reference format",
28922892
},
2893-
{
2894-
name: "valid s2i build w/ runtimeImage",
2895-
build: buildapi.Build{
2896-
ObjectMeta: metav1.ObjectMeta{Name: "build", Namespace: "default"},
2897-
Spec: buildapi.BuildSpec{
2898-
CommonSpec: buildapi.CommonSpec{
2899-
Source: buildapi.BuildSource{
2900-
Binary: &buildapi.BinaryBuildSource{},
2901-
},
2902-
Strategy: buildapi.BuildStrategy{
2903-
SourceStrategy: &buildapi.SourceBuildStrategy{
2904-
From: kapi.ObjectReference{
2905-
Kind: "DockerImage",
2906-
Name: "myimage:tag",
2907-
},
2908-
RuntimeImage: &kapi.ObjectReference{
2909-
Kind: "DockerImage",
2910-
Name: "runtimestream:tag",
2911-
},
2912-
},
2913-
},
2914-
},
2915-
},
2916-
},
2917-
expectedError: "",
2918-
},
29192893
{
29202894
name: "docker build with ImageStreamTag in from",
29212895
build: buildapi.Build{
@@ -3022,32 +2996,6 @@ func TestValidateBuildImageRefs(t *testing.T) {
30222996
},
30232997
expectedError: "Required value",
30242998
},
3025-
{
3026-
name: "s2i build with ImageStreamTag runtimeImage",
3027-
build: buildapi.Build{
3028-
ObjectMeta: metav1.ObjectMeta{Name: "build", Namespace: "default"},
3029-
Spec: buildapi.BuildSpec{
3030-
CommonSpec: buildapi.CommonSpec{
3031-
Source: buildapi.BuildSource{
3032-
Binary: &buildapi.BinaryBuildSource{},
3033-
},
3034-
Strategy: buildapi.BuildStrategy{
3035-
SourceStrategy: &buildapi.SourceBuildStrategy{
3036-
From: kapi.ObjectReference{
3037-
Kind: "DockerImage",
3038-
Name: "myimage:tag",
3039-
},
3040-
RuntimeImage: &kapi.ObjectReference{
3041-
Kind: "ImageStreamTag",
3042-
Name: "",
3043-
},
3044-
},
3045-
},
3046-
},
3047-
},
3048-
},
3049-
expectedError: "Required value",
3050-
},
30512999
{
30523000
name: "custom build with ImageStreamTag in from",
30533001
build: buildapi.Build{

test/extended/builds/failure_status.go

+12-34
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,18 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
2121

2222
var (
2323
// convert the s2i failure cases to our own StatusReason
24-
reasonAssembleFailed = buildapi.StatusReason(s2istatus.ReasonAssembleFailed)
25-
messageAssembleFailed = string(s2istatus.ReasonMessageAssembleFailed)
26-
reasonFetchRuntimeArtifacts = buildapi.StatusReason(s2istatus.ReasonRuntimeArtifactsFetchFailed)
27-
messageFetchRuntimeArtifacts = string(s2istatus.ReasonMessageRuntimeArtifactsFetchFailed)
28-
postCommitHookFixture = exutil.FixturePath("testdata", "statusfail-postcommithook.yaml")
29-
fetchDockerSrc = exutil.FixturePath("testdata", "statusfail-fetchsourcedocker.yaml")
30-
fetchS2ISrc = exutil.FixturePath("testdata", "statusfail-fetchsources2i.yaml")
31-
badContextDirS2ISrc = exutil.FixturePath("testdata", "statusfail-badcontextdirs2i.yaml")
32-
builderImageFixture = exutil.FixturePath("testdata", "statusfail-fetchbuilderimage.yaml")
33-
pushToRegistryFixture = exutil.FixturePath("testdata", "statusfail-pushtoregistry.yaml")
34-
fetchRuntimeArtifactsFixture = exutil.FixturePath("testdata", "statusfail-runtimeartifacts.yaml")
35-
failedAssembleFixture = exutil.FixturePath("testdata", "statusfail-failedassemble.yaml")
36-
failedGenericReason = exutil.FixturePath("testdata", "statusfail-genericreason.yaml")
37-
binaryBuildDir = exutil.FixturePath("testdata", "statusfail-assemble")
38-
oc = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
24+
reasonAssembleFailed = buildapi.StatusReason(s2istatus.ReasonAssembleFailed)
25+
messageAssembleFailed = string(s2istatus.ReasonMessageAssembleFailed)
26+
postCommitHookFixture = exutil.FixturePath("testdata", "statusfail-postcommithook.yaml")
27+
fetchDockerSrc = exutil.FixturePath("testdata", "statusfail-fetchsourcedocker.yaml")
28+
fetchS2ISrc = exutil.FixturePath("testdata", "statusfail-fetchsources2i.yaml")
29+
badContextDirS2ISrc = exutil.FixturePath("testdata", "statusfail-badcontextdirs2i.yaml")
30+
builderImageFixture = exutil.FixturePath("testdata", "statusfail-fetchbuilderimage.yaml")
31+
pushToRegistryFixture = exutil.FixturePath("testdata", "statusfail-pushtoregistry.yaml")
32+
failedAssembleFixture = exutil.FixturePath("testdata", "statusfail-failedassemble.yaml")
33+
failedGenericReason = exutil.FixturePath("testdata", "statusfail-genericreason.yaml")
34+
binaryBuildDir = exutil.FixturePath("testdata", "statusfail-assemble")
35+
oc = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
3936
)
4037

4138
g.Context("", func() {
@@ -202,25 +199,6 @@ var _ = g.Describe("[Feature:Builds][Slow] update failure status", func() {
202199
})
203200
})
204201

205-
g.Describe("Build status failed assemble runtime artifacts", func() {
206-
g.It("should contain the failure reason related to failing to fetch runtime image artifacts", func() {
207-
err := oc.Run("create").Args("-f", fetchRuntimeArtifactsFixture).Execute()
208-
o.Expect(err).NotTo(o.HaveOccurred())
209-
210-
br, err := exutil.StartBuildAndWait(oc, "statusfail-runtimeartifacts", "--build-loglevel=5")
211-
o.Expect(err).NotTo(o.HaveOccurred())
212-
br.AssertFailure()
213-
br.DumpLogs()
214-
215-
build, err := oc.BuildClient().Build().Builds(oc.Namespace()).Get(br.Build.Name, metav1.GetOptions{})
216-
o.Expect(err).NotTo(o.HaveOccurred())
217-
o.Expect(build.Status.Reason).To(o.Equal(reasonFetchRuntimeArtifacts))
218-
o.Expect(build.Status.Message).To(o.Equal(messageFetchRuntimeArtifacts))
219-
220-
exutil.CheckForBuildEvent(oc.KubeClient().Core(), br.Build, buildapi.BuildFailedEventReason, buildapi.BuildFailedEventMessage)
221-
})
222-
})
223-
224202
g.Describe("Build status failed https proxy invalid url", func() {
225203
g.It("should contain the generic failure reason and message", func() {
226204
err := oc.Run("create").Args("-f", failedGenericReason).Execute()

test/extended/builds/s2i_extended_build.go

-156
This file was deleted.

0 commit comments

Comments
 (0)