From 34179107624b813cdabde4bb67dbabc99b580c79 Mon Sep 17 00:00:00 2001 From: Dibyo Mukherjee Date: Tue, 2 Jul 2019 15:53:03 -0400 Subject: [PATCH] Fix examples + revert changes to VENDOR-LICENSE --- examples/conditions/always-false.yaml | 12 ---- examples/conditions/alwaysTrue.yaml | 12 ---- ...etup.yaml => conditional-pipelinerun.yaml} | 30 +++++++++- examples/pipelineruns/demo-pr.yaml | 13 ----- third_party/VENDOR-LICENSE | 58 +++++++++++++++---- 5 files changed, 74 insertions(+), 51 deletions(-) delete mode 100644 examples/conditions/always-false.yaml delete mode 100644 examples/conditions/alwaysTrue.yaml rename examples/pipelineruns/{pipelinerun-conditional-setup.yaml => conditional-pipelinerun.yaml} (59%) delete mode 100644 examples/pipelineruns/demo-pr.yaml diff --git a/examples/conditions/always-false.yaml b/examples/conditions/always-false.yaml deleted file mode 100644 index f5c689fabdc..00000000000 --- a/examples/conditions/always-false.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: tekton.dev/v1alpha1 -kind: Condition -metadata: - # General purpose condition for checking if a file exists at the given - name: always-false -spec: - check: - # Check is a container spec describing the container to be run to - # check the condition - image: ubuntu - command: ["/bin/bash"] - args: ['exit 1'] \ No newline at end of file diff --git a/examples/conditions/alwaysTrue.yaml b/examples/conditions/alwaysTrue.yaml deleted file mode 100644 index 38dcdf557d1..00000000000 --- a/examples/conditions/alwaysTrue.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: tekton.dev/v1alpha1 -kind: Condition -metadata: - # General purpose condition for checking if a file exists at the given - name: always-true -spec: - check: - # Check is a container spec describing the container to be run to - # check the condition - image: ubuntu - command: ["/bin/bash"] - args: ['-c', 'ls'] \ No newline at end of file diff --git a/examples/pipelineruns/pipelinerun-conditional-setup.yaml b/examples/pipelineruns/conditional-pipelinerun.yaml similarity index 59% rename from examples/pipelineruns/pipelinerun-conditional-setup.yaml rename to examples/pipelineruns/conditional-pipelinerun.yaml index d0826ca0af1..91848c009e8 100644 --- a/examples/pipelineruns/pipelinerun-conditional-setup.yaml +++ b/examples/pipelineruns/conditional-pipelinerun.yaml @@ -1,4 +1,17 @@ apiVersion: tekton.dev/v1alpha1 +kind: Condition +metadata: + # General purpose condition for checking if a file exists at the given + name: always-true +spec: + check: + # Check is a container spec describing the container to be run to + # check the condition + image: ubuntu + command: ["/bin/bash"] + args: ['-c', 'ls'] +--- +apiVersion: tekton.dev/v1alpha1 kind: PipelineResource metadata: name: fiat-git @@ -24,7 +37,7 @@ spec: - name: run-ls image: ubuntu command: ["/bin/bash"] - args: ['-c', 'ls -al /workspace/workspace'] + args: ['-c', 'ls -al ${inputs.resources.workspace.path}'] --- apiVersion: tekton.dev/v1alpha1 kind: Pipeline @@ -48,4 +61,17 @@ spec: resources: inputs: - name: workspace - resource: source-repo \ No newline at end of file + resource: source-repo +--- +apiVersion: tekton.dev/v1alpha1 +kind: PipelineRun +metadata: + name: demo-pr +spec: + pipelineRef: + name: list-files-pipeline + serviceAccount: 'default' + resources: + - name: source-repo + resourceRef: + name: fiat-git \ No newline at end of file diff --git a/examples/pipelineruns/demo-pr.yaml b/examples/pipelineruns/demo-pr.yaml deleted file mode 100644 index bb20ab7999a..00000000000 --- a/examples/pipelineruns/demo-pr.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineRun -metadata: - generateName: demo-pr -spec: - pipelineRef: - name: list-files-pipeline - serviceAccount: 'default' - resources: - - name: source-repo - resourceRef: - name: fiat-git \ No newline at end of file diff --git a/third_party/VENDOR-LICENSE b/third_party/VENDOR-LICENSE index 757072d5365..093404f0866 100644 --- a/third_party/VENDOR-LICENSE +++ b/third_party/VENDOR-LICENSE @@ -1,3 +1,4 @@ + =========================================================== Import: github.com/tektoncd/pipeline/vendor/cloud.google.com/go @@ -1509,7 +1510,7 @@ Import: github.com/tektoncd/pipeline/vendor/github.com/evanphx/json-patch Copyright (c) 2014, Evan Phoenix All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this @@ -1517,19 +1518,19 @@ modification, are permitted provided that the following conditions are met: * Redistributions in binary form must reproduce the above copyright notice this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of the Evan Phoenix nor the names of its contributors - may be used to endorse or promote products derived from this software +* Neither the name of the Evan Phoenix nor the names of its contributors + may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -2797,7 +2798,39 @@ Import: github.com/tektoncd/pipeline/vendor/github.com/google/gofuzz =========================================================== +Import: github.com/tektoncd/pipeline/vendor/github.com/google/uuid + +Copyright (c) 2009,2014 Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +=========================================================== Import: github.com/tektoncd/pipeline/vendor/github.com/googleapis/gax-go Copyright 2016, Google Inc. @@ -9009,3 +9042,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +