From 9fc679a9592c9c790b126e698cc0b5c65a53344a Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Fri, 5 Mar 2021 11:24:41 +0100 Subject: [PATCH 1/2] Add operator branch to main jobs --- .../cluster-api/cluster-api-presubmits-main.yaml | 5 +++++ 1 file changed, 5 insertions(+) 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 index 6e0b9a84a9f9..8dbd4c8b6bed 100644 --- 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:v20210302-a6bf478-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,6 +74,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:v20210302-a6bf478-go-canary @@ -93,6 +97,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:v20210302-a6bf478-go-canary From c3d69597aa6bb48e7da73b63dfa2ea0e3866ae01 Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Wed, 10 Mar 2021 23:24:22 +0100 Subject: [PATCH 2/2] Add CAPI operator verify task --- .../cluster-api/cluster-api-presubmits-main.yaml | 3 +-- 1 file changed, 1 insertion(+), 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 index 8dbd4c8b6bed..bf72a8378317 100644 --- a/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml +++ b/config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml @@ -80,8 +80,7 @@ presubmits: - image: gcr.io/k8s-testimages/kubekins-e2e:v20210302-a6bf478-go-canary command: - "runner.sh" - - "make" - - "verify" + - ./scripts/ci-verify.sh resources: requests: cpu: 7300m