diff --git a/pkg/build/apis/build/validation/validation_test.go b/pkg/build/apis/build/validation/validation_test.go index cfc12c5dbb55..a7a7dacbb554 100644 --- 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 index 44c365e58ccf..42887a9618a0 100644 --- 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 deleted file mode 100644 index 5a21aa4567b7..000000000000 --- a/test/extended/builds/s2i_extended_build.go +++ /dev/null @@ -1,156 +0,0 @@ -package builds - -import ( - "path/filepath" - - g "github.com/onsi/ginkgo" - o "github.com/onsi/gomega" - exutil "github.com/openshift/origin/test/extended/util" - e2e "k8s.io/kubernetes/test/e2e/framework" -) - -var _ = g.Describe("[Feature:Builds][Slow] s2i extended build", func() { - defer g.GinkgoRecover() - - var ( - oc = exutil.NewCLI("extended-build", exutil.KubeConfigPath()) - testDataDir = exutil.FixturePath("testdata", "build-extended") - runnerConf = filepath.Join(testDataDir, "jvm-runner.yaml") - runnerWithScriptsConf = filepath.Join(testDataDir, "jvm-runner-with-scripts.yaml") - scriptsFromRepoBc = filepath.Join(testDataDir, "bc-scripts-in-repo.yaml") - scriptsFromURLBc = filepath.Join(testDataDir, "bc-scripts-by-url.yaml") - scriptsFromImageBc = filepath.Join(testDataDir, "bc-scripts-in-the-image.yaml") - ) - - g.Context("", func() { - g.JustBeforeEach(func() { - g.By("waiting for builder service account") - err := exutil.WaitForBuilderAccount(oc.KubeClient().Core().ServiceAccounts(oc.Namespace())) - o.Expect(err).NotTo(o.HaveOccurred()) - - // we have to wait until image stream tag will be available, otherwise - // `oc start-build` will fail with 'imagestreamtags "wildfly:10.0" not found' error. - // See this issue for details: https://github.com/openshift/origin/issues/10103 - err = exutil.WaitForAnImageStreamTag(oc, "openshift", "wildfly", "10.0") - o.Expect(err).NotTo(o.HaveOccurred()) - }) - - g.AfterEach(func() { - if g.CurrentGinkgoTestDescription().Failed { - exutil.DumpPodStates(oc) - exutil.DumpPodLogsStartingWith("", oc) - } - }) - - g.Describe("with scripts from the source repository", func() { - oc.SetOutputDir(exutil.TestContext.OutputDir) - - g.It("should use assemble-runtime script from the source repository", func() { - - g.By("creating jvm-runner configuration") - err := exutil.CreateResource(runnerConf, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("building jvm-runner image") - br, _ := exutil.StartBuildAndWait(oc, "jvm-runner") - br.AssertSuccess() - - g.By("creating build config") - err = exutil.CreateResource(scriptsFromRepoBc, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("running the build") - br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-repo", "--build-loglevel=5") - br.AssertSuccess() - buildLog, err := br.Logs() - if err != nil { - e2e.Failf("Failed to fetch build logs: %v", err) - } - - g.By("expecting that .s2i/bin/assemble-runtime was executed") - o.Expect(buildLog).To(o.ContainSubstring(`Using "assemble-runtime" installed from "/.s2i/bin/assemble-runtime"`)) - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: assembling app within runtime image")) - - g.By("expecting that environment variable from BuildConfig is available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_BUILD_CONFIG=yes")) - - g.By("expecting that environment variable from .s2i/environment is available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_FILE=yes")) - }) - }) - - g.Describe("with scripts from URL", func() { - oc.SetOutputDir(exutil.TestContext.OutputDir) - - g.It("should use assemble-runtime script from URL", func() { - - g.By("creating jvm-runner configuration") - err := exutil.CreateResource(runnerConf, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("building jvm-runner image") - br, _ := exutil.StartBuildAndWait(oc, "jvm-runner") - br.AssertSuccess() - - g.By("creating build config") - err = exutil.CreateResource(scriptsFromURLBc, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("running the build") - br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-url", "--build-loglevel=5") - br.AssertSuccess() - buildLog, err := br.Logs() - if err != nil { - e2e.Failf("Failed to fetch build logs: %v", err) - } - - g.By("expecting that .s2i/bin/assemble-runtime was executed") - o.Expect(buildLog).To(o.ContainSubstring(`Using "assemble-runtime" installed from "https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin/assemble-runtime"`)) - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: assembling app within runtime image")) - - g.By("expecting that environment variable from BuildConfig is available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_BUILD_CONFIG=yes")) - - g.By("expecting that environment variable from .s2i/environment isn't available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_FILE=no")) - }) - }) - - g.Describe("with scripts from runtime image", func() { - oc.SetOutputDir(exutil.TestContext.OutputDir) - - g.It("should use assemble-runtime script from that image", func() { - - g.By("creating jvm-runner-with-scripts configuration") - err := exutil.CreateResource(runnerWithScriptsConf, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("building jvm-runner-with-scripts image") - br, _ := exutil.StartBuildAndWait(oc, "jvm-runner-with-scripts") - br.AssertSuccess() - - g.By("creating build config") - err = exutil.CreateResource(scriptsFromImageBc, oc) - o.Expect(err).NotTo(o.HaveOccurred()) - - g.By("running the build") - br, _ = exutil.StartBuildAndWait(oc, "java-extended-build-from-image", "--build-loglevel=5") - br.AssertSuccess() - buildLog, err := br.Logs() - if err != nil { - e2e.Failf("Failed to fetch build logs: %v", err) - } - - g.By("expecting that .s2i/bin/assemble-runtime was executed") - o.Expect(buildLog).To(o.ContainSubstring(`Using "assemble-runtime" installed from "image:///usr/libexec/s2i/assemble-runtime"`)) - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: assembling app within runtime image")) - - g.By("expecting that environment variable from BuildConfig is available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_BUILD_CONFIG=yes")) - - g.By("expecting that environment variable from .s2i/environment isn't available") - o.Expect(buildLog).To(o.ContainSubstring(".s2i/bin/assemble-runtime: USING_ENV_FROM_FILE=no")) - }) - }) - }) -}) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 5611c787fa84..6594f6329bb3 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -7,11 +7,6 @@ // test/extended/testdata/aggregator/sample-apiserver-rc.yaml // test/extended/testdata/aggregator/sample-apiserver-sa.yaml // test/extended/testdata/aggregator/sample-apiserver-service.yaml -// test/extended/testdata/build-extended/bc-scripts-by-url.yaml -// test/extended/testdata/build-extended/bc-scripts-in-repo.yaml -// test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml -// test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml -// test/extended/testdata/build-extended/jvm-runner.yaml // test/extended/testdata/build-pruning/default-group-build-config.yaml // test/extended/testdata/build-pruning/default-legacy-build-config.yaml // test/extended/testdata/build-pruning/errored-build-config.yaml @@ -145,7 +140,6 @@ // test/extended/testdata/statusfail-genericreason.yaml // test/extended/testdata/statusfail-postcommithook.yaml // test/extended/testdata/statusfail-pushtoregistry.yaml -// test/extended/testdata/statusfail-runtimeartifacts.yaml // test/extended/testdata/sti-environment-build-app/.sti/environment // test/extended/testdata/sti-environment-build-app/Gemfile // test/extended/testdata/sti-environment-build-app/config.ru @@ -507,214 +501,6 @@ func testExtendedTestdataAggregatorSampleApiserverServiceYaml() (*asset, error) return a, nil } -var _testExtendedTestdataBuildExtendedBcScriptsByUrlYaml = []byte(`kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-url -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner:0.1" - runtimeArtifacts: - - sourcePath: /opt/s2i/destination/src/target/hello.jar - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" - scripts: "https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin" -`) - -func testExtendedTestdataBuildExtendedBcScriptsByUrlYamlBytes() ([]byte, error) { - return _testExtendedTestdataBuildExtendedBcScriptsByUrlYaml, nil -} - -func testExtendedTestdataBuildExtendedBcScriptsByUrlYaml() (*asset, error) { - bytes, err := testExtendedTestdataBuildExtendedBcScriptsByUrlYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/build-extended/bc-scripts-by-url.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataBuildExtendedBcScriptsInRepoYaml = []byte(`kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-repo -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - ref: s2i-assemble-and-assemble-runtime - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner:0.1" - runtimeArtifacts: - - sourcePath: /opt/s2i/destination/src/target/hello.jar - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" -`) - -func testExtendedTestdataBuildExtendedBcScriptsInRepoYamlBytes() ([]byte, error) { - return _testExtendedTestdataBuildExtendedBcScriptsInRepoYaml, nil -} - -func testExtendedTestdataBuildExtendedBcScriptsInRepoYaml() (*asset, error) { - bytes, err := testExtendedTestdataBuildExtendedBcScriptsInRepoYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/build-extended/bc-scripts-in-repo.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataBuildExtendedBcScriptsInTheImageYaml = []byte(`kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-image -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - ref: s2i-assemble-only - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner-with-scripts:0.1" - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" -`) - -func testExtendedTestdataBuildExtendedBcScriptsInTheImageYamlBytes() ([]byte, error) { - return _testExtendedTestdataBuildExtendedBcScriptsInTheImageYaml, nil -} - -func testExtendedTestdataBuildExtendedBcScriptsInTheImageYaml() (*asset, error) { - bytes, err := testExtendedTestdataBuildExtendedBcScriptsInTheImageYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYaml = []byte(`kind: List -apiVersion: v1 -items: - -- kind: ImageStream - apiVersion: v1 - metadata: - name: jvm-runner-with-scripts - -- kind: BuildConfig - apiVersion: v1 - metadata: - name: jvm-runner-with-scripts - spec: - source: - dockerfile: | - FROM jboss/base-jdk:8 - LABEL io.openshift.s2i.scripts-url "image:///usr/libexec/s2i" - LABEL io.openshift.s2i.assemble-input-files "/opt/s2i/destination/src/target/hello.jar" - USER root - RUN mkdir -p /usr/libexec/s2i && \ - curl -s https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin/assemble-runtime | tee /usr/libexec/s2i/assemble-runtime && \ - chmod +x /usr/libexec/s2i/assemble-runtime && \ - curl -s https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin/run | tee /usr/libexec/s2i/run && \ - chmod +x /usr/libexec/s2i/run - USER 1000 - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: jvm-runner-with-scripts:0.1 -`) - -func testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYamlBytes() ([]byte, error) { - return _testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYaml, nil -} - -func testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYaml() (*asset, error) { - bytes, err := testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - -var _testExtendedTestdataBuildExtendedJvmRunnerYaml = []byte(`kind: List -apiVersion: v1 -items: - -- kind: ImageStream - apiVersion: v1 - metadata: - name: jvm-runner - -- kind: BuildConfig - apiVersion: v1 - metadata: - name: jvm-runner - spec: - source: - dockerfile: | - FROM jboss/base-jdk:8 - USER 1000 - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: jvm-runner:0.1 -`) - -func testExtendedTestdataBuildExtendedJvmRunnerYamlBytes() ([]byte, error) { - return _testExtendedTestdataBuildExtendedJvmRunnerYaml, nil -} - -func testExtendedTestdataBuildExtendedJvmRunnerYaml() (*asset, error) { - bytes, err := testExtendedTestdataBuildExtendedJvmRunnerYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/build-extended/jvm-runner.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - var _testExtendedTestdataBuildPruningDefaultGroupBuildConfigYaml = []byte(`apiVersion: build.openshift.io/v1 kind: BuildConfig metadata: @@ -7638,43 +7424,6 @@ func testExtendedTestdataStatusfailPushtoregistryYaml() (*asset, error) { return a, nil } -var _testExtendedTestdataStatusfailRuntimeartifactsYaml = []byte(`kind: BuildConfig -apiVersion: v1 -metadata: - name: statusfail-runtimeartifacts -spec: - source: - git: - uri: "https://github.com/openshift/ruby-hello-world" - strategy: - sourceStrategy: - from: - kind: DockerImage - name: centos/ruby-23-centos7 - runtimeArtifacts: - - destinationDir: app - sourcePath: /tmp/failure - runtimeImage: - kind: DockerImage - name: centos/ruby-23-centos7 - type: Source -`) - -func testExtendedTestdataStatusfailRuntimeartifactsYamlBytes() ([]byte, error) { - return _testExtendedTestdataStatusfailRuntimeartifactsYaml, nil -} - -func testExtendedTestdataStatusfailRuntimeartifactsYaml() (*asset, error) { - bytes, err := testExtendedTestdataStatusfailRuntimeartifactsYamlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "test/extended/testdata/statusfail-runtimeartifacts.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info} - return a, nil -} - var _testExtendedTestdataStiEnvironmentBuildAppStiEnvironment = []byte(`TEST_ENV=success `) @@ -28454,11 +28203,6 @@ var _bindata = map[string]func() (*asset, error){ "test/extended/testdata/aggregator/sample-apiserver-rc.yaml": testExtendedTestdataAggregatorSampleApiserverRcYaml, "test/extended/testdata/aggregator/sample-apiserver-sa.yaml": testExtendedTestdataAggregatorSampleApiserverSaYaml, "test/extended/testdata/aggregator/sample-apiserver-service.yaml": testExtendedTestdataAggregatorSampleApiserverServiceYaml, - "test/extended/testdata/build-extended/bc-scripts-by-url.yaml": testExtendedTestdataBuildExtendedBcScriptsByUrlYaml, - "test/extended/testdata/build-extended/bc-scripts-in-repo.yaml": testExtendedTestdataBuildExtendedBcScriptsInRepoYaml, - "test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml": testExtendedTestdataBuildExtendedBcScriptsInTheImageYaml, - "test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml": testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYaml, - "test/extended/testdata/build-extended/jvm-runner.yaml": testExtendedTestdataBuildExtendedJvmRunnerYaml, "test/extended/testdata/build-pruning/default-group-build-config.yaml": testExtendedTestdataBuildPruningDefaultGroupBuildConfigYaml, "test/extended/testdata/build-pruning/default-legacy-build-config.yaml": testExtendedTestdataBuildPruningDefaultLegacyBuildConfigYaml, "test/extended/testdata/build-pruning/errored-build-config.yaml": testExtendedTestdataBuildPruningErroredBuildConfigYaml, @@ -28592,7 +28336,6 @@ var _bindata = map[string]func() (*asset, error){ "test/extended/testdata/statusfail-genericreason.yaml": testExtendedTestdataStatusfailGenericreasonYaml, "test/extended/testdata/statusfail-postcommithook.yaml": testExtendedTestdataStatusfailPostcommithookYaml, "test/extended/testdata/statusfail-pushtoregistry.yaml": testExtendedTestdataStatusfailPushtoregistryYaml, - "test/extended/testdata/statusfail-runtimeartifacts.yaml": testExtendedTestdataStatusfailRuntimeartifactsYaml, "test/extended/testdata/sti-environment-build-app/.sti/environment": testExtendedTestdataStiEnvironmentBuildAppStiEnvironment, "test/extended/testdata/sti-environment-build-app/Gemfile": testExtendedTestdataStiEnvironmentBuildAppGemfile, "test/extended/testdata/sti-environment-build-app/config.ru": testExtendedTestdataStiEnvironmentBuildAppConfigRu, @@ -28825,13 +28568,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "sample-apiserver-sa.yaml": &bintree{testExtendedTestdataAggregatorSampleApiserverSaYaml, map[string]*bintree{}}, "sample-apiserver-service.yaml": &bintree{testExtendedTestdataAggregatorSampleApiserverServiceYaml, map[string]*bintree{}}, }}, - "build-extended": &bintree{nil, map[string]*bintree{ - "bc-scripts-by-url.yaml": &bintree{testExtendedTestdataBuildExtendedBcScriptsByUrlYaml, map[string]*bintree{}}, - "bc-scripts-in-repo.yaml": &bintree{testExtendedTestdataBuildExtendedBcScriptsInRepoYaml, map[string]*bintree{}}, - "bc-scripts-in-the-image.yaml": &bintree{testExtendedTestdataBuildExtendedBcScriptsInTheImageYaml, map[string]*bintree{}}, - "jvm-runner-with-scripts.yaml": &bintree{testExtendedTestdataBuildExtendedJvmRunnerWithScriptsYaml, map[string]*bintree{}}, - "jvm-runner.yaml": &bintree{testExtendedTestdataBuildExtendedJvmRunnerYaml, map[string]*bintree{}}, - }}, "build-pruning": &bintree{nil, map[string]*bintree{ "default-group-build-config.yaml": &bintree{testExtendedTestdataBuildPruningDefaultGroupBuildConfigYaml, map[string]*bintree{}}, "default-legacy-build-config.yaml": &bintree{testExtendedTestdataBuildPruningDefaultLegacyBuildConfigYaml, map[string]*bintree{}}, @@ -29049,7 +28785,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "statusfail-genericreason.yaml": &bintree{testExtendedTestdataStatusfailGenericreasonYaml, map[string]*bintree{}}, "statusfail-postcommithook.yaml": &bintree{testExtendedTestdataStatusfailPostcommithookYaml, map[string]*bintree{}}, "statusfail-pushtoregistry.yaml": &bintree{testExtendedTestdataStatusfailPushtoregistryYaml, map[string]*bintree{}}, - "statusfail-runtimeartifacts.yaml": &bintree{testExtendedTestdataStatusfailRuntimeartifactsYaml, map[string]*bintree{}}, "sti-environment-build-app": &bintree{nil, map[string]*bintree{ ".sti": &bintree{nil, map[string]*bintree{ "environment": &bintree{testExtendedTestdataStiEnvironmentBuildAppStiEnvironment, map[string]*bintree{}}, diff --git a/test/extended/testdata/build-extended/bc-scripts-by-url.yaml b/test/extended/testdata/build-extended/bc-scripts-by-url.yaml deleted file mode 100644 index d69bdfa762de..000000000000 --- a/test/extended/testdata/build-extended/bc-scripts-by-url.yaml +++ /dev/null @@ -1,23 +0,0 @@ -kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-url -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner:0.1" - runtimeArtifacts: - - sourcePath: /opt/s2i/destination/src/target/hello.jar - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" - scripts: "https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin" diff --git a/test/extended/testdata/build-extended/bc-scripts-in-repo.yaml b/test/extended/testdata/build-extended/bc-scripts-in-repo.yaml deleted file mode 100644 index d58ea82bb955..000000000000 --- a/test/extended/testdata/build-extended/bc-scripts-in-repo.yaml +++ /dev/null @@ -1,23 +0,0 @@ -kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-repo -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - ref: s2i-assemble-and-assemble-runtime - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner:0.1" - runtimeArtifacts: - - sourcePath: /opt/s2i/destination/src/target/hello.jar - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" diff --git a/test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml b/test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml deleted file mode 100644 index 28667058b2e4..000000000000 --- a/test/extended/testdata/build-extended/bc-scripts-in-the-image.yaml +++ /dev/null @@ -1,21 +0,0 @@ -kind: BuildConfig -apiVersion: v1 -metadata: - name: java-extended-build-from-image -spec: - source: - git: - uri: "https://github.com/openshift/test-maven-app.git" - ref: s2i-assemble-only - strategy: - sourceStrategy: - from: - kind: ImageStreamTag - name: "wildfly:10.0" - namespace: openshift - runtimeImage: - kind: ImageStreamTag - name: "jvm-runner-with-scripts:0.1" - env: - - name: USING_ENV_FROM_BUILD_CONFIG - value: "yes" diff --git a/test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml b/test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml deleted file mode 100644 index 13a7874b29c3..000000000000 --- a/test/extended/testdata/build-extended/jvm-runner-with-scripts.yaml +++ /dev/null @@ -1,32 +0,0 @@ -kind: List -apiVersion: v1 -items: - -- kind: ImageStream - apiVersion: v1 - metadata: - name: jvm-runner-with-scripts - -- kind: BuildConfig - apiVersion: v1 - metadata: - name: jvm-runner-with-scripts - spec: - source: - dockerfile: | - FROM jboss/base-jdk:8 - LABEL io.openshift.s2i.scripts-url "image:///usr/libexec/s2i" - LABEL io.openshift.s2i.assemble-input-files "/opt/s2i/destination/src/target/hello.jar" - USER root - RUN mkdir -p /usr/libexec/s2i && \ - curl -s https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin/assemble-runtime | tee /usr/libexec/s2i/assemble-runtime && \ - chmod +x /usr/libexec/s2i/assemble-runtime && \ - curl -s https://raw.githubusercontent.com/openshift/test-maven-app/s2i-assemble-and-assemble-runtime/.s2i/bin/run | tee /usr/libexec/s2i/run && \ - chmod +x /usr/libexec/s2i/run - USER 1000 - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: jvm-runner-with-scripts:0.1 diff --git a/test/extended/testdata/build-extended/jvm-runner.yaml b/test/extended/testdata/build-extended/jvm-runner.yaml deleted file mode 100644 index 84f6f1d74f3c..000000000000 --- a/test/extended/testdata/build-extended/jvm-runner.yaml +++ /dev/null @@ -1,24 +0,0 @@ -kind: List -apiVersion: v1 -items: - -- kind: ImageStream - apiVersion: v1 - metadata: - name: jvm-runner - -- kind: BuildConfig - apiVersion: v1 - metadata: - name: jvm-runner - spec: - source: - dockerfile: | - FROM jboss/base-jdk:8 - USER 1000 - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: jvm-runner:0.1 diff --git a/test/extended/testdata/statusfail-runtimeartifacts.yaml b/test/extended/testdata/statusfail-runtimeartifacts.yaml deleted file mode 100644 index 75b89fb1db0b..000000000000 --- a/test/extended/testdata/statusfail-runtimeartifacts.yaml +++ /dev/null @@ -1,20 +0,0 @@ -kind: BuildConfig -apiVersion: v1 -metadata: - name: statusfail-runtimeartifacts -spec: - source: - git: - uri: "https://github.com/openshift/ruby-hello-world" - strategy: - sourceStrategy: - from: - kind: DockerImage - name: centos/ruby-23-centos7 - runtimeArtifacts: - - destinationDir: app - sourcePath: /tmp/failure - runtimeImage: - kind: DockerImage - name: centos/ruby-23-centos7 - type: Source