e2e: Run tekton e2e against pipeline v0.11.1 (#803)

* Use buildah task from master branch and paramterize FORMAT * Configure pipeline v0.11.1 * DNM: Run tekton e2e in this PR * Revert "DNM: Run tekton e2e in this PR" This reverts commit 903f5be.
knative · Apr 15, 2020 · 9828230 · 9828230
1 parent 48f4359
commit 9828230
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 68 deletions.
diff --git a/test/e2e/tekton_test.go b/test/e2e/tekton_test.go
@@ -55,7 +55,7 @@ func TestTektonPipeline(t *testing.T) {
 	_, err = kubectl.Run("apply", "-f", basedir+"/kn-deployer-rbac.yaml")
 	assert.NilError(t, err)
 
-	_, err = kubectl.Run("apply", "-f", basedir+"/buildah.yaml")
+	_, err = kubectl.Run("apply", "-f", "https://raw.githubusercontent.com/tektoncd/catalog/master/buildah/buildah.yaml")
 	assert.NilError(t, err)
 
 	_, err = kubectl.Run("apply", "-f", "https://raw.githubusercontent.com/tektoncd/catalog/master/kn/kn.yaml")

diff --git a/test/resources/tekton/buildah.yaml b/test/resources/tekton/buildah.yaml
diff --git a/test/resources/tekton/kn-pipeline-run.yaml b/test/resources/tekton/kn-pipeline-run.yaml
@@ -27,6 +27,8 @@ spec:
       resourceRef:
         name: buildah-build-kn-create-image
   params:
+    - name: IMAGE_FORMAT
+      value: "docker"
     - name: ARGS
       value:
         - "service"

diff --git a/test/resources/tekton/kn-pipeline.yaml b/test/resources/tekton/kn-pipeline.yaml
@@ -27,6 +27,9 @@ spec:
     description: Arguments to pass to kn CLI
     default:
       - "help"
+  - name: IMAGE_FORMAT
+    type: string
+    description: Image format to build and push to registry
   tasks:
   - name: buildah-build
     taskRef:
@@ -43,6 +46,8 @@ spec:
       value: ./test/test_images/helloworld/Dockerfile
     - name: BUILDER_IMAGE
       value: "quay.io/buildah/stable:latest"
+    - name: FORMAT
+      value: "$(params.IMAGE_FORMAT)"
   - name: kn-service-create
     taskRef:
       name: kn

diff --git a/test/tekton-tests.sh b/test/tekton-tests.sh
@@ -28,16 +28,18 @@ export PATH=$PATH:${REPO_ROOT_DIR}
 # Script entry point.
 initialize $@
 
-export TEKTON_VERSION=${TEKTON_VERSION:-v0.9.2}
+export TEKTON_VERSION=${TEKTON_VERSION:-v0.11.1}
 export KN_E2E_NAMESPACE=tkn-kn
 
 header "Running integration tests for Tekton"
 
+subheader "Installing Tekton Pipelines ${TEKTON_VERSION}"
 # Install Tekton if not already installed
 if [[ $(kubectl api-resources | grep -c tekton.dev) -eq 0 ]]; then
   kubectl apply -f https://github.com/tektoncd/pipeline/releases/download/${TEKTON_VERSION}/release.yaml
 fi
 
+subheader "Configuring docker and registry"
 if (( IS_PROW )); then
   # Configure Docker so that we can create a secret for GCR
   gcloud auth configure-docker
@@ -53,6 +55,7 @@ for file in kn-deployer-rbac kn-pipeline-resource; do
       -e "s#\${CONTAINER_REGISTRY}#${CONTAINER_REGISTRY}#" ${resource_dir}/${file}-template.yaml > ${resource_dir}/${file}.yaml
 done
 
+subheader "Running test pipeline"
 go_test_e2e -timeout=30m -tags=tekton ./test/e2e || fail_test
 
 success