Merge pull request kubernetes#29770 from furkatgofurov7/use-run-if-ch…

…anged-consistently-capioperator CAPI Operator: use 'run_if_changed' consistently in presubmit jobs
ybettan · Jun 15, 2023 · 6f00dee · 6f00dee
2 parents fbc8a6c + debc001
commit 6f00dee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-main.yaml
@@ -60,13 +60,13 @@ presubmits:
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api-operator
-    always_run: true
     optional: true
     labels:
       preset-service-account: "true"
     branches:
     # The script this job runs is not in all branches.
     - ^main$
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
@@ -113,12 +113,12 @@ presubmits:
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api-operator
-    always_run: true
     labels:
       preset-service-account: "true"
     branches:
     # The script this job runs is not in all branches.
     - ^main$
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
@@ -139,8 +139,7 @@ presubmits:
     path_alias: "sigs.k8s.io/cluster-api-operator"
     optional: false
     decorate: true
-    # please see: https://play.golang.org/p/JJSVylVPd53 for more insights
-    run_if_changed: (^[^d].*$)|(^d$)|(^.[^o].*$)|(^do$)|(^..[^c].*$)|(^doc$)|(^...[^s].*$)|(^docs$)|(^....[^/].*$)|(^[^d][^o][^c][^s]/.*$)
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     max_concurrency: 5
     labels:
       preset-dind-enabled: "true"

diff --git a/...obs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml b/...obs/kubernetes-sigs/cluster-api-operator/cluster-api-operator-presubmits-release-0-3.yaml
@@ -60,13 +60,13 @@ presubmits:
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api-operator
-    always_run: true
     optional: true
     labels:
       preset-service-account: "true"
     branches:
     # The script this job runs is not in all branches.
     - ^release-0.3$
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
@@ -113,12 +113,12 @@ presubmits:
     cluster: eks-prow-build-cluster
     decorate: true
     path_alias: sigs.k8s.io/cluster-api-operator
-    always_run: true
     labels:
       preset-service-account: "true"
     branches:
     # The script this job runs is not in all branches.
     - ^release-0.3$
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     spec:
       containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230613-63d85f5ed2-1.25
@@ -139,8 +139,7 @@ presubmits:
     path_alias: "sigs.k8s.io/cluster-api-operator"
     optional: false
     decorate: true
-    # please see: https://play.golang.org/p/JJSVylVPd53 for more insights
-    run_if_changed: (^[^d].*$)|(^d$)|(^.[^o].*$)|(^do$)|(^..[^c].*$)|(^doc$)|(^...[^s].*$)|(^docs$)|(^....[^/].*$)|(^[^d][^o][^c][^s]/.*$)
+    run_if_changed: '^((api|cmd|config|controllers|hack|internal|scripts|test|util|webhook)/|go\.mod|go\.sum|Dockerfile|Makefile)'
     max_concurrency: 5
     labels:
       preset-dind-enabled: "true"