From dd6190e80a58842ae79ec890dd93da6557c24053 Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Tue, 27 Aug 2024 13:34:04 +0200 Subject: [PATCH] Lint job for the velero project (konveyor-dev branch) - adds lint job for the velero project (konveyor-dev branch) - adds run_if_changed for unit and lint jobs to trigger only for a relevant files. Signed-off-by: Michal Pryc --- .../velero/openshift-velero-konveyor-dev.yaml | 14 +++- ...nshift-velero-konveyor-dev-presubmits.yaml | 68 ++++++++++++++++++- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml b/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml index e00b813ef4b57..9859ecd3c5c2c 100644 --- a/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml +++ b/ci-operator/config/openshift/velero/openshift-velero-konveyor-dev.yaml @@ -31,7 +31,7 @@ resources: memory: 200Mi tests: - as: unit-test - optional: true + run_if_changed: (\.sh|\.go|config/.*|cmd/.*|assets/.*|internal/.*|Dockerfile.*|Makefile.*)$ steps: test: - as: unit @@ -41,6 +41,18 @@ tests: requests: cpu: 100m memory: 200Mi +- as: lint + run_if_changed: .*\.go$ + steps: + test: + - as: lint + commands: | + PATH="/go/bin:$PATH" make -f Makefile.prow lint + from: src + resources: + requests: + cpu: 100m + memory: 200Mi zz_generated_metadata: branch: konveyor-dev org: openshift diff --git a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml index de961af00cc11..c186bde56c421 100644 --- a/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/velero/openshift-velero-konveyor-dev-presubmits.yaml @@ -15,7 +15,6 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-konveyor-dev-images - optional: true rerun_command: /test images spec: containers: @@ -60,7 +59,70 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false + branches: + - ^konveyor-dev$ + - ^konveyor-dev- + cluster: build02 + context: ci/prow/lint + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-velero-konveyor-dev-lint + rerun_command: /test lint + run_if_changed: .*\.go$ + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --secret-dir=/secrets/ci-pull-credentials + - --target=lint + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )lint,?($|\s.*) + - agent: kubernetes + always_run: false branches: - ^konveyor-dev$ - ^konveyor-dev- @@ -73,8 +135,8 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-velero-konveyor-dev-unit-test - optional: true rerun_command: /test unit-test + run_if_changed: (\.sh|\.go|config/.*|cmd/.*|assets/.*|internal/.*|Dockerfile.*|Makefile.*)$ spec: containers: - args: