Merge pull request #661 from Nordix/lentzi90/remove-redundant-prow-jobs

Remove redundant prow jobs covered by golangci-lint
metal3-io · Mar 8, 2024 · 4f4acb9 · 4f4acb9
2 parents 368b61a + 8bd17bc
commit 4f4acb9
Showing 1 changed file with 25 additions and 255 deletions.
diff --git a/prow/manifests/overlays/metal3/config.yaml b/prow/manifests/overlays/metal3/config.yaml
@@ -438,23 +438,6 @@ presubmits:
   metal3-io/baremetal-operator:
     - name: gofmt
       branches:
-        - main
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.21
-            imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - release-0.5
         - release-0.4
         - release-0.3
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
@@ -471,6 +454,9 @@ presubmits:
             image: docker.io/golang:1.20
             imagePullPolicy: Always
     - name: gosec
+      branches:
+        - release-0.4
+        - release-0.3
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -668,7 +654,8 @@ presubmits:
             imagePullPolicy: Always
     - name: golint
       branches:
-        - main
+        - release-0.4
+        - release-0.3
       skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
       decorate: true
       spec:
@@ -680,24 +667,33 @@ presubmits:
             env:
               - name: IS_CONTAINER
                 value: "TRUE"
+            image: docker.io/golang:1.20
+            imagePullPolicy: Always
+    # NOTE: The test jobs are for verifying Makefile and hack/* script changes only
+    - name: test
+      branches:
+        - main
+      run_if_changed: "^(Makefile|hack/.*)$"
+      decorate: true
+      spec:
+        containers:
+          - args:
+              - test
+            command:
+              - make
             image: docker.io/golang:1.21
             imagePullPolicy: Always
-    - name: golint
+    - name: test
       branches:
         - release-0.5
-        - release-0.4
-        - release-0.3
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
+      run_if_changed: "^(Makefile|hack/.*)$"
       decorate: true
       spec:
         containers:
           - args:
-              - ./hack/golint.sh
+              - test
             command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
+              - make
             image: docker.io/golang:1.20
             imagePullPolicy: Always
     - name: manifestlint
@@ -802,71 +798,7 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.19
             imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - main
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.21
-            imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - release-1.5
-        - release-1.6
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.20
-            imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
-    - name: gosec
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gosec.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/securego/gosec:2.14.0@sha256:73858f8b1b9b7372917677151ec6deeceeaa40c5b02753080bd647dede14e213
-            imagePullPolicy: Always
+    # NOTE: The test jobs are for verifying Makefile and hack/* script changes only
     - name: test
       branches:
         - main
@@ -910,55 +842,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.19
             imagePullPolicy: Always
-    - name: govet
-      branches:
-        - main
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.21
-            imagePullPolicy: Always
-    - name: govet
-      branches:
-        - release-1.5
-        - release-1.6
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.20
-            imagePullPolicy: Always
-    - name: govet
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: markdownlint
       branches:
         - main
@@ -1429,22 +1312,7 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.19
             imagePullPolicy: Always
-    - name: gosec
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gosec.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/securego/gosec:2.14.0@sha256:73858f8b1b9b7372917677151ec6deeceeaa40c5b02753080bd647dede14e213
-            imagePullPolicy: Always
+    # NOTE: The test jobs are for verifying the Makefile and hack/* scripts only
     - name: test
       branches:
         - main
@@ -1472,55 +1340,6 @@ presubmits:
               - make
             image: docker.io/golang:1.20
             imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - main
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.21
-            imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - release-1.5
-        - release-1.6
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.20
-            imagePullPolicy: Always
-    - name: gofmt
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/gofmt.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: golangci-lint
       branches:
         - release-1.4
@@ -1537,55 +1356,6 @@ presubmits:
                 value: "TRUE"
             image: docker.io/golang:1.19
             imagePullPolicy: Always
-    - name: govet
-      branches:
-        - main
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.21
-            imagePullPolicy: Always
-    - name: govet
-      branches:
-        - release-1.5
-        - release-1.6
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.20
-            imagePullPolicy: Always
-    - name: govet
-      branches:
-        - release-1.4
-      skip_if_only_changed: '(((^|/)OWNERS)|(\.md))$'
-      decorate: true
-      spec:
-        containers:
-          - args:
-              - ./hack/govet.sh
-            command:
-              - sh
-            env:
-              - name: IS_CONTAINER
-                value: "TRUE"
-            image: docker.io/golang:1.19
-            imagePullPolicy: Always
     - name: markdownlint
       branches:
         - main