Bug 1684397: Remove custom build template

Per [BZ 1684397](https://bugzilla.redhat.com/show_bug.cgi?id=1684397), removing this template in favor of openshift-docs tutorial. Template is still used to test the custom build strategy.
openshift · Mar 8, 2019 · 4e17c40 · 4e17c40
1 parent 2f6ec30
commit 4e17c40
Show file tree

Hide file tree

Showing 6 changed files with 520 additions and 521 deletions.
diff --git a/examples/examples_test.go b/examples/examples_test.go
@@ -78,7 +78,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"github-webhook-example":             nil, // Skip.
 			"application-template-stibuild":      &templateapi.Template{},
 			"application-template-dockerbuild":   &templateapi.Template{},
-			"application-template-custombuild":   &templateapi.Template{},
 			"application-template-pullspecbuild": &templateapi.Template{},
 		},
 		"../examples/jenkins": {

diff --git a/test/cmd/printer.sh b/test/cmd/printer.sh
@@ -10,7 +10,7 @@ os::cmd::expect_success_and_text 'oc get all' 'imagestream.image.openshift.io/te
 os::cmd::expect_success_and_not_text 'oc get is' 'imagestream.image.openshift.io/test1'
 
 # Test that resource printer includes namespaces for buildconfigs with custom strategies
-os::cmd::expect_success 'oc create -f examples/sample-app/application-template-custombuild.json'
+os::cmd::expect_success 'oc create -f test/extended/testdata/builds/application-template-custombuild.json'
 os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample' 'deploymentconfig.apps.openshift.io "frontend" created'
 os::cmd::expect_success_and_text 'oc get all --all-namespaces' 'cmd-printer[\ ]+buildconfig.build.openshift.io\/ruby\-sample\-build'
 

diff --git a/test/end-to-end/core.sh b/test/end-to-end/core.sh
@@ -375,7 +375,7 @@ DOCKER_CONFIG_FILE="${ARTIFACT_DIR}/dockerAppConfig.json"
 CUSTOM_CONFIG_FILE="${ARTIFACT_DIR}/customAppConfig.json"
 os::cmd::expect_success "oc process -n test -f examples/sample-app/application-template-stibuild.json > '${STI_CONFIG_FILE}'"
 os::cmd::expect_success "oc process -n docker -f examples/sample-app/application-template-dockerbuild.json > '${DOCKER_CONFIG_FILE}'"
-os::cmd::expect_success "oc process -n custom -f examples/sample-app/application-template-custombuild.json > '${CUSTOM_CONFIG_FILE}'"
+os::cmd::expect_success "oc process -n custom -f test/extended/testdata/builds/application-template-custombuild.json > '${CUSTOM_CONFIG_FILE}'"
 
 os::log::info "Back to 'test' context with 'e2e-user' user"
 os::cmd::expect_success 'oc login -u e2e-user'

diff --git a/test/extended/cli/rsync.go b/test/extended/cli/rsync.go
@@ -301,18 +301,18 @@ var _ = g.Describe("[cli][Slow] can use rsync to upload files to pods", func() {
 		})
 
 		g.It("should honor multiple --exclude flags", func() {
-			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=application-template-custombuild.json --exclude=application-template-dockerbuild.json", sourcePath2, podName))
+			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=application-template-pullspecbuild.json --exclude=application-template-dockerbuild.json", sourcePath2, podName))
 			err := oc.Run("rsync").Args(
 				sourcePath2,
 				fmt.Sprintf("%s:/tmp", podName),
-				"--exclude=application-template-custombuild.json",
+				"--exclude=application-template-pullspecbuild.json",
 				"--exclude=application-template-dockerbuild.json").Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			g.By("Verifying that files are copied to the container")
 			result, err := oc.Run("rsh").Args(podName, "ls", "/tmp/sample-app").Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
-			o.Expect(result).NotTo(o.ContainSubstring("application-template-custombuild.json"))
+			o.Expect(result).NotTo(o.ContainSubstring("application-template-pullspecbuild.json"))
 			o.Expect(result).NotTo(o.ContainSubstring("application-template-dockerbuild.json"))
 			o.Expect(result).To(o.ContainSubstring("application-template-stibuild.json"))
 		})
@@ -334,21 +334,21 @@ var _ = g.Describe("[cli][Slow] can use rsync to upload files to pods", func() {
 		})
 
 		g.It("should honor multiple --include flags", func() {
-			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=*.json --include=application-template-custombuild.json --include=application-template-dockerbuild.json", sourcePath2, podName))
+			g.By(fmt.Sprintf("Calling oc rsync %s %s:/tmp --exclude=*.json --include=application-template-stibuild.json --include=application-template-dockerbuild.json", sourcePath2, podName))
 			err := oc.Run("rsync").Args(
 				sourcePath2,
 				fmt.Sprintf("%s:/tmp", podName),
 				"--exclude=*.json",
-				"--include=application-template-custombuild.json",
+				"--include=application-template-stibuild.json",
 				"--include=application-template-dockerbuild.json").Execute()
 			o.Expect(err).NotTo(o.HaveOccurred())
 
 			g.By("Verifying that files are copied to the container")
 			result, err := oc.Run("rsh").Args(podName, "ls", "/tmp/sample-app").Output()
 			o.Expect(err).NotTo(o.HaveOccurred())
-			o.Expect(result).To(o.ContainSubstring("application-template-custombuild.json"))
+			o.Expect(result).To(o.ContainSubstring("application-template-stibuild.json"))
 			o.Expect(result).To(o.ContainSubstring("application-template-dockerbuild.json"))
-			o.Expect(result).NotTo(o.ContainSubstring("application-template-stibuild.json"))
+			o.Expect(result).NotTo(o.ContainSubstring("application-template-pullspecbuild.json"))
 		})
 
 		g.It("should honor the --progress flag", func() {