Pull buildah and kn tasks directly from catalog

knative · Dec 2, 2019 · 0976ec0 · 0976ec0
1 parent 61dc2b6
commit 0976ec0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 102 deletions.
diff --git a/test/e2e/tekton_test.go b/test/e2e/tekton_test.go
@@ -50,10 +50,10 @@ func TestTektonPipeline(t *testing.T) {
 	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", basedir + "/kn-deployer-rbac.yaml"}, runOpts{})
 	assert.NilError(t, err)
 
-	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", basedir + "/buildah-task.yaml"}, runOpts{})
+	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", "https://raw.githubusercontent.com/tektoncd/catalog/master/buildah/buildah.yaml"}, runOpts{})
 	assert.NilError(t, err)
 
-	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", basedir + "/kn-task.yaml"}, runOpts{})
+	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", "https://raw.githubusercontent.com/tektoncd/catalog/master/kn/kn.yaml"}, runOpts{})
 	assert.NilError(t, err)
 
 	_, err = kubectl.RunWithOpts([]string{"apply", "-n", test.env.Namespace, "-f", basedir + "/kn-pipeline.yaml"}, runOpts{})

diff --git a/test/resources/tekton/buildah-task.yaml b/test/resources/tekton/buildah-task.yaml
diff --git a/test/resources/tekton/kn-pipeline.yaml b/test/resources/tekton/kn-pipeline.yaml
@@ -38,6 +38,9 @@ spec:
       outputs:
         - name: image
           resource: image
+    params:
+    - name: DOCKERFILE
+      value: ./test/test_images/helloworld/Dockerfile
   - name: kn-service-create
     taskRef:
       name: kn

diff --git a/test/resources/tekton/kn-task.yaml b/test/resources/tekton/kn-task.yaml
diff --git a/test/test_images/helloworld/Dockerfile b/test/test_images/helloworld/Dockerfile
@@ -5,7 +5,7 @@ FROM golang:1.12 as builder
 
 # Copy local code to the container image.
 WORKDIR /go/src/knative.dev/client/test/test_images/helloworld
-COPY . .
+COPY ./test/test_images/helloworld/helloworld.go .
 
 # Build the command inside the container.
 # (You may fetch or manage dependencies here,