Merge pull request #21182 from alexander-demichev/operator-jobs

CAPI: Add operator branch to main jobs
kubernetes · Mar 17, 2021 · aa7a3b0 · aa7a3b0
2 parents 6f8c716 + c3d6959
commit aa7a3b0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml
@@ -9,6 +9,7 @@ presubmits:
     branches:
     # The script this job runs is not in all branches.
     - ^master$
+    - ^operator-0.4$
     spec:
       containers:
       - image: gcr.io/k8s-testimages/kubekins-e2e:v20210312-67f589a-go-canary
@@ -28,6 +29,7 @@ presubmits:
     branches:
     # The script this job runs is not in all branches.
     - ^master$
+    - ^operator-0.4$
     spec:
       containers:
       - command:
@@ -53,6 +55,7 @@ presubmits:
     branches:
     # The script this job runs is not in all branches.
     - ^master$
+    - ^operator-0.4$
     spec:
       containers:
       - command:
@@ -71,13 +74,13 @@ presubmits:
     branches:
     # The script this job runs is not in all branches.
     - ^master$
+    - ^operator-0.4$
     spec:
       containers:
       - image: gcr.io/k8s-testimages/kubekins-e2e:v20210312-67f589a-go-canary
         command:
         - "runner.sh"
-        - "make"
-        - "verify"
+        - ./scripts/ci-verify.sh
         resources:
           requests:
             cpu: 7300m
@@ -93,6 +96,7 @@ presubmits:
     branches:
     # The script this job runs is not in all branches.
     - ^master$
+    - ^operator-0.4$
     spec:
       containers:
       - image: gcr.io/k8s-testimages/kubekins-e2e:v20210312-67f589a-go-canary