From 54fd98fdce82f25616c9dce486b209f5da5082de Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 13 Feb 2024 12:13:20 -0600 Subject: [PATCH 1/6] update --- .../0.1/verify-enterprise-contract.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml index 3f1c6399a..40ff4c75f 100644 --- a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml +++ b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# +# comment # SPDX-License-Identifier: Apache-2.0 --- From b22380b6bc5b5c8d1c41315f2263737389819baa Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 13 Feb 2024 12:52:28 -0600 Subject: [PATCH 2/6] update --- .tekton/verify-enterprise-contract-task-pull-request.yaml | 3 ++- .tekton/verify-enterprise-contract-task-push.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.tekton/verify-enterprise-contract-task-pull-request.yaml b/.tekton/verify-enterprise-contract-task-pull-request.yaml index 25fc1a982..efa36e606 100644 --- a/.tekton/verify-enterprise-contract-task-pull-request.yaml +++ b/.tekton/verify-enterprise-contract-task-pull-request.yaml @@ -1,3 +1,4 @@ +# comment apiVersion: tekton.dev/v1 kind: PipelineRun metadata: @@ -8,7 +9,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/verify-enterprise-contract/0.1/')) + == "ec-release-debugging" creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/.tekton/verify-enterprise-contract-task-push.yaml b/.tekton/verify-enterprise-contract-task-push.yaml index 4904aa1a5..ca53a3021 100644 --- a/.tekton/verify-enterprise-contract-task-push.yaml +++ b/.tekton/verify-enterprise-contract-task-push.yaml @@ -7,7 +7,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/verify-enterprise-contract/')) + == "ec-release-debugging" creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging From 742dec8b2fc51450745937544e3533774b8d3c03 Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 13 Feb 2024 12:57:21 -0600 Subject: [PATCH 3/6] update --- .tekton/verify-enterprise-contract-task-pull-request.yaml | 3 +-- .tekton/verify-enterprise-contract-task-push.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.tekton/verify-enterprise-contract-task-pull-request.yaml b/.tekton/verify-enterprise-contract-task-pull-request.yaml index efa36e606..57f6feb93 100644 --- a/.tekton/verify-enterprise-contract-task-pull-request.yaml +++ b/.tekton/verify-enterprise-contract-task-pull-request.yaml @@ -1,4 +1,3 @@ -# comment apiVersion: tekton.dev/v1 kind: PipelineRun metadata: @@ -9,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" + == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/verify-enterprise-contract/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/.tekton/verify-enterprise-contract-task-push.yaml b/.tekton/verify-enterprise-contract-task-push.yaml index ca53a3021..4904aa1a5 100644 --- a/.tekton/verify-enterprise-contract-task-push.yaml +++ b/.tekton/verify-enterprise-contract-task-push.yaml @@ -7,7 +7,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch - == "ec-release-debugging" + == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/verify-enterprise-contract/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging From 844cf0bf7f4de2a408a260103eddb1d18dcc0c74 Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 13 Feb 2024 13:01:00 -0600 Subject: [PATCH 4/6] update --- .tekton/ec-cli-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tekton/ec-cli-pull-request.yaml b/.tekton/ec-cli-pull-request.yaml index 272ac3e1c..89c9f6e7f 100644 --- a/.tekton/ec-cli-pull-request.yaml +++ b/.tekton/ec-cli-pull-request.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" + == "ec-release-debugging" && files.all.exists(x, x.matches('pkg/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging From b291f93860b659e0d5939bc7f919742b375137bd Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 13 Feb 2024 13:03:54 -0600 Subject: [PATCH 5/6] update --- .tekton/ec-cli-pull-request.yaml | 2 +- .tekton/verify-enterprise-contract-task-pull-request.yaml | 2 +- internal/applicationsnapshot/attestation.go | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.tekton/ec-cli-pull-request.yaml b/.tekton/ec-cli-pull-request.yaml index 89c9f6e7f..2b8dca87d 100644 --- a/.tekton/ec-cli-pull-request.yaml +++ b/.tekton/ec-cli-pull-request.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('pkg/')) + == "ec-release-debugging" && files.all.exists(x, x.matches('internal/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/.tekton/verify-enterprise-contract-task-pull-request.yaml b/.tekton/verify-enterprise-contract-task-pull-request.yaml index 57f6feb93..28183e476 100644 --- a/.tekton/verify-enterprise-contract-task-pull-request.yaml +++ b/.tekton/verify-enterprise-contract-task-pull-request.yaml @@ -8,7 +8,7 @@ metadata: build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/verify-enterprise-contract/')) + == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/internal/applicationsnapshot/attestation.go b/internal/applicationsnapshot/attestation.go index 220e40958..e56252194 100644 --- a/internal/applicationsnapshot/attestation.go +++ b/internal/applicationsnapshot/attestation.go @@ -49,3 +49,7 @@ func (r *Report) attestations() ([]in_toto.Statement, error) { } return statements, nil } + +func toString() string { + return "attestation" +} From c043b92533407177a1971a7ff1668fc3c47bdeee Mon Sep 17 00:00:00 2001 From: Joe Stuart Date: Tue, 27 Feb 2024 11:30:57 -0600 Subject: [PATCH 6/6] update --- .tekton/ec-cli-pull-request.yaml | 3 +-- .tekton/verify-enterprise-contract-task-pull-request.yaml | 3 +-- .../0.1/verify-enterprise-contract.yaml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.tekton/ec-cli-pull-request.yaml b/.tekton/ec-cli-pull-request.yaml index 2b8dca87d..9a5bfb819 100644 --- a/.tekton/ec-cli-pull-request.yaml +++ b/.tekton/ec-cli-pull-request.yaml @@ -7,8 +7,7 @@ metadata: build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('internal/')) + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && files.all.exists(x, x.matches('internal/')) creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/.tekton/verify-enterprise-contract-task-pull-request.yaml b/.tekton/verify-enterprise-contract-task-pull-request.yaml index 28183e476..872887e30 100644 --- a/.tekton/verify-enterprise-contract-task-pull-request.yaml +++ b/.tekton/verify-enterprise-contract-task-pull-request.yaml @@ -7,8 +7,7 @@ metadata: build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}' build.appstudio.redhat.com/target_branch: '{{target_branch}}' pipelinesascode.tekton.dev/max-keep-runs: "3" - pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch - == "ec-release-debugging" && files.all.exists(x, x.matches('tasks/')) + pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" creationTimestamp: null labels: appstudio.openshift.io/application: ec-release-debugging diff --git a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml index 40ff4c75f..f579b2abf 100644 --- a/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml +++ b/tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml @@ -1,3 +1,4 @@ +--- # Copyright The Enterprise Contract Contributors # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,7 +15,6 @@ # comment # SPDX-License-Identifier: Apache-2.0 ---- apiVersion: tekton.dev/v1 kind: Task metadata: