diff --git a/docs/eventlisteners.md b/docs/eventlisteners.md index 0f69bbd26..974f56da9 100644 --- a/docs/eventlisteners.md +++ b/docs/eventlisteners.md @@ -341,9 +341,56 @@ spec: - cel: filter: "body.action in ['opened', 'synchronize', 'reopened']" bindings: - - ref: github-binding + - ref: github-pr-binding template: name: github-template +--- +apiVersion: triggers.tekton.dev/v1alpha1 +kind: TriggerBinding +metadata: + name: github-pr-binding +spec: + params: + - name: gitrevision + value: $(body.pull_request.head.sha) + - name: gitrepositoryurl + value: $(body.repository.clone_url) + +--- +apiVersion: triggers.tekton.dev/v1alpha1 +kind: TriggerTemplate +metadata: + name: github-template +spec: + params: + - name: gitrevision + - name: gitrepositoryurl + resourcetemplates: + - apiVersion: tekton.dev/v1alpha1 + kind: TaskRun + metadata: + generateName: github-run- + spec: + taskSpec: + inputs: + resources: + - name: source + type: git + steps: + - image: ubuntu + script: | + #! /bin/bash + ls -al $(inputs.resources.source.path) + inputs: + resources: + - name: source + resourceSpec: + type: git + params: + - name: revision + value: $(tt.params.gitrevision) + - name: url + value: $(tt.params.gitrepositoryurl) ``` diff --git a/examples/github/README.md b/examples/github/README.md index c6506e65b..a19df902d 100644 --- a/examples/github/README.md +++ b/examples/github/README.md @@ -27,9 +27,9 @@ Creates an EventListener that listens for GitHub webhook events. ```bash curl -v \ -H 'X-GitHub-Event: pull_request' \ - -H 'X-Hub-Signature: sha1=13eaa0168f8d8efcdf5189ea75b782cf89809de6' \ + -H 'X-Hub-Signature: sha1=ba0cdc263b3492a74b601d240c27efe81c4720cb' \ -H 'Content-Type: application/json' \ - -d '{"action": "opened", "head_commit":{"id":"master"},"repository":{"url": "https://github.com/tektoncd/triggers"}}' \ + -d '{"action": "opened", "pull_request":{"head":{"sha": "28911bbb5a3e2ea034daf1f6be0a822d50e31e73"}},"repository":{"clone_url": "https://github.com/tektoncd/triggers.git"}}' \ http://localhost:8080 ``` diff --git a/examples/github/github-eventlistener-interceptor.yaml b/examples/github/github-eventlistener-interceptor.yaml index 07cc34ab9..73f27c389 100644 --- a/examples/github/github-eventlistener-interceptor.yaml +++ b/examples/github/github-eventlistener-interceptor.yaml @@ -17,6 +17,53 @@ spec: - cel: filter: "body.action in ['opened', 'synchronize', 'reopened']" bindings: - - ref: github-binding + - ref: github-pr-binding template: name: github-template +--- +apiVersion: triggers.tekton.dev/v1alpha1 +kind: TriggerBinding +metadata: + name: github-pr-binding +spec: + params: + - name: gitrevision + value: $(body.pull_request.head.sha) + - name: gitrepositoryurl + value: $(body.repository.clone_url) + +--- +apiVersion: triggers.tekton.dev/v1alpha1 +kind: TriggerTemplate +metadata: + name: github-template +spec: + params: + - name: gitrevision + - name: gitrepositoryurl + resourcetemplates: + - apiVersion: tekton.dev/v1alpha1 + kind: TaskRun + metadata: + generateName: github-run- + spec: + taskSpec: + inputs: + resources: + - name: source + type: git + steps: + - image: ubuntu + script: | + #! /bin/bash + ls -al $(inputs.resources.source.path) + inputs: + resources: + - name: source + resourceSpec: + type: git + params: + - name: revision + value: $(tt.params.gitrevision) + - name: url + value: $(tt.params.gitrepositoryurl) diff --git a/examples/github/triggerbinding.yaml b/examples/github/triggerbinding.yaml deleted file mode 100644 index 8ba4f289f..000000000 --- a/examples/github/triggerbinding.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: triggers.tekton.dev/v1alpha1 -kind: TriggerBinding -metadata: - name: github-binding -spec: - params: - - name: gitrevision - value: $(body.head_commit.id) - - name: gitrepositoryurl - value: $(body.repository.url) diff --git a/examples/github/triggertemplate.yaml b/examples/github/triggertemplate.yaml deleted file mode 100644 index 0ae033e6c..000000000 --- a/examples/github/triggertemplate.yaml +++ /dev/null @@ -1,35 +0,0 @@ ---- -apiVersion: triggers.tekton.dev/v1alpha1 -kind: TriggerTemplate -metadata: - name: github-template -spec: - params: - - name: gitrevision - - name: gitrepositoryurl - resourcetemplates: - - apiVersion: tekton.dev/v1alpha1 - kind: TaskRun - metadata: - generateName: github-run- - spec: - taskSpec: - inputs: - resources: - - name: source - type: git - steps: - - image: ubuntu - script: | - #! /bin/bash - ls -al $(inputs.resources.source.path) - inputs: - resources: - - name: source - resourceSpec: - type: git - params: - - name: revision - value: $(tt.params.gitrevision) - - name: url - value: $(tt.params.gitrepositoryurl)