Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP]fix yamllint issues #60

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-definitions-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Pull changes from build-definitions

on:
schedule:
- cron: "0 0 * * *"
- cron: "0 0 * * *"
workflow_dispatch:

permissions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ patches:
- path: patch.yaml
target:
kind: Task

21 changes: 9 additions & 12 deletions hack/patches/tasks/verify-enterprise-contract/patch.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
- op: add
path: /spec/steps/-
value:
name: annotate-task
image: registry.redhat.io/openshift4/ose-cli:4.13@sha256:73df37794ffff7de1101016c23dc623e4990810390ebdabcbbfa065214352c7c
script: |
#!/usr/bin/env bash
echo "verify-enterprise-contract $(context.taskRun.name)"
oc annotate taskrun $(context.taskRun.name) task.results.format=application/json
oc annotate taskrun $(context.taskRun.name) task.results.type=ec
oc annotate taskrun $(context.taskRun.name) task.results.container=step-report-json
oc annotate taskrun $(context.taskRun.name) task.output.location=logs
- op: add
path: /spec/steps/-
value:
name: annotate-task
image: registry.redhat.io/openshift4/ose-cli:4.13@sha256:73df37794ffff7de1101016c23dc623e4990810390ebdabcbbfa065214352c7c
script: |
#!/usr/bin/env bash
echo "verify-enterprise-contract $(context.taskRun.name)"
oc annotate taskrun $(context.taskRun.name) task.results.format=application/json
16 changes: 8 additions & 8 deletions pac/docker-build-rhtap/docker-pull-request.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: {{ values.name }}-on-pull-request
name: "{{values.name}}-on-pull-request"
annotations:
pipelinesascode.tekton.dev/on-event: "[pull_request]"
pipelinesascode.tekton.dev/on-target-branch: "[{{ values.defaultBranch }}]"
pipelinesascode.tekton.dev/on-target-branch: "[{{values.defaultBranch}}]"
pipelinesascode.tekton.dev/max-keep-runs: "2"
pipelinesascode.tekton.dev/pipeline: "{{values.rawUrl}}/pac/pipelines/docker-build-rhtap.yaml"
pipelinesascode.tekton.dev/task-0: "{{values.rawUrl}}/pac/tasks/init.yaml"
Expand All @@ -19,32 +19,32 @@ metadata:
spec:
params:
- name: dockerfile
value: {{ values.dockerfile }}
value: {{values.dockerfile}}
- name: git-url
value: '{{repo_url}}'
- name: image-expires-after
value: 5d
- name: output-image
value: {{ values.image }}:on-pr-{{revision}}
value: "{{values.image}}:on-pr-{{revision}}"
- name: path-context
value: {{ values.buildContext }}
value: {{values.buildContext}}
- name: revision
value: '{{revision}}'
- name: event-type
value: '{{event_type}}'
- name: gitops-auth-secret-name
value: {{ values.gitopsSecretName }}
value: {{values.gitopsSecretName}}
pipelineRef:
name: docker-build-rhtap
workspaces:
- name: git-auth
secret:
secretName: "{{ git_auth_secret }}"
secretName: "{{git_auth_secret}}"
- name: workspace
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 1Gi
16 changes: 8 additions & 8 deletions pac/docker-build-rhtap/docker-push.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: {{ values.name }}-on-push
name: "{{values.name}}-on-push"
annotations:
pipelinesascode.tekton.dev/on-event: "[push]"
pipelinesascode.tekton.dev/on-target-branch: "[{{ values.defaultBranch }}]"
pipelinesascode.tekton.dev/on-target-branch: "[{{values.defaultBranch}}]"
pipelinesascode.tekton.dev/max-keep-runs: "2"
pipelinesascode.tekton.dev/pipeline: "{{values.rawUrl}}/pac/pipelines/docker-build-rhtap.yaml"
pipelinesascode.tekton.dev/task-0: "{{values.rawUrl}}/pac/tasks/init.yaml"
Expand All @@ -19,21 +19,21 @@ metadata:
spec:
params:
- name: dockerfile
value: {{ values.dockerfile }}
value: {{values.dockerfile}}
- name: git-url
value: '{{repo_url}}'
- name: image-expires-after
value: 5d
- name: output-image
value: {{ values.image }}:{{revision}}
value: "{{values.image}}:{{revision}}"
- name: path-context
value: {{ values.buildContext }}
value: {{values.buildContext}}
- name: revision
value: '{{revision}}'
- name: event-type
value: '{{event_type}}'
- name: gitops-auth-secret-name
value: {{ values.gitopsSecretName }}
value: {{values.gitopsSecretName}}
pipelineRef:
name: docker-build-rhtap
workspaces:
Expand All @@ -42,12 +42,12 @@ spec:
secretName: $(params.gitops-auth-secret-name)
- name: git-auth
secret:
secretName: "{{ git_auth_secret }}"
secretName: "{{git_auth_secret}}"
- name: workspace
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 1Gi
38 changes: 21 additions & 17 deletions pac/gitops-repo/gitops-on-pull-request.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: {{ values.name }}-gitops-on-pull-request
name: "{{values.name}}-gitops-on-pull-request"
annotations:
pipelinesascode.tekton.dev/on-event: "[pull_request]"
pipelinesascode.tekton.dev/on-target-branch: "[{{ values.defaultBranch }}]"
pipelinesascode.tekton.dev/on-target-branch: "[{{values.defaultBranch}}]"
pipelinesascode.tekton.dev/pipeline: "{{values.rawUrl}}/pac/pipelines/gitops-pull-request-rhtap.yaml"
pipelinesascode.tekton.dev/task-0: "{{values.rawUrl}}/pac/tasks/git-clone.yaml"
pipelinesascode.tekton.dev/task-1: "{{values.rawUrl}}/pac/tasks/gather-deploy-images.yaml"
pipelinesascode.tekton.dev/task-2: "{{values.rawUrl}}/pac/tasks/verify-enterprise-contract.yaml"
pipelinesascode.tekton.dev/task-3: "{{values.rawUrl}}/pac/tasks/gather-deploy-images.yaml"
pipelinesascode.tekton.dev/task-4: "{{values.rawUrl}}/pac/tasks/download-sbom-from-url-in-attestation.yaml"
pipelinesascode.tekton.dev/task-5: "{{values.rawUrl}}/pac/tasks/upload-sbom-to-trustification.yaml"
spec:
params:
- name: git-url
value: '{{repo_url}}'
- name: revision
value: '{{revision}}'
- name: target-branch
value: '{{target_branch}}'
- name: fail-if-trustification-not-configured
value: 'false'
- name: dockerfile
value: {{values.dockerfile}}
- name: git-url
value: '{{repo_url}}'
- name: image-expires-after
value: 5d
- name: output-image
value: "{{values.image}}:on-pr-{{revision}}"
- name: path-context
value: {{values.buildContext}}
- name: revision
value: '{{revision}}'
- name: event-type
value: '{{event_type}}'
- name: gitops-auth-secret-name
value: {{values.gitopsSecretName}}
pipelineRef:
name: gitops-pull-request
name: docker-build-rhtap
workspaces:
- name: git-auth
secret:
secretName: "{{ git_auth_secret }}"
secretName: "{{git_auth_secret}}"
- name: workspace
volumeClaimTemplate:
spec:
accessModes:
- ReadWriteOnce
- ReadWriteOnce
resources:
requests:
storage: 1Gi
Loading