CAPI: Add operator branch to main jobs #21182

alexander-demicev · 2021-03-05T10:27:09Z

There was created a separate branch for developing new operator. This branch will later be merged in main but now it needs the same CI jobs.

Fixes: kubernetes-sigs/cluster-api#4269

k8s-ci-robot · 2021-03-05T10:27:17Z

Hi @alexander-demichev. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

JoelSpeed · 2021-03-05T10:32:16Z

/ok-to-test
/lgtm

Intention here is to have this as a temporary branch but have all of the existing presubmits running against it to ensure we don't break anything

fabriziopandini

/hold
for kubernetes-sigs/cluster-api#4126 to merge

vincepri

/approve
/lgtm

k8s-ci-robot · 2021-03-08T20:52:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexander-demichev, vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~config/jobs/kubernetes-sigs/cluster-api/OWNERS~~ [vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

vincepri · 2021-03-08T20:53:07Z

@fabriziopandini I don't think we need to hold on that, given that the jobs are going to be the same, but the operator specific ones are additional

fabriziopandini

@fabriziopandini I don't think we need to hold on that, given that the jobs are going to be the same, but the operator specific ones are additional

I think we should sort out the makefile in the operator branch first, because /scripts rely on that (see kubernetes-sigs/cluster-api#4126 (comment))

fabriziopandini · 2021-03-08T15:19:44Z

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$


This assumes kubernetes-sigs/cluster-api#4126 (comment) to be addressed first; If we are going to have different makefiles, the /scripts should be updated accordingly

fabriziopandini · 2021-03-08T16:11:10Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

@@ -113,6 +118,7 @@ presubmits:
    branches:
    # The script this job runs is not in all branches.
    - ^master$
+    - ^operator-0.4$


Does it makes sense to run the e2e tests for this branch given that it everything else should not be affected by the operator work?

I thought we might add the operator to e2e or it makes more sense to have a separate job for that?

That's for sure, but the question is when
As for now, e2e jobs rely on clusterctl, and according to our latest discussion, the work for getting clusterctl to use the operator will start only when the operator is completed. Does It makes sense to run e2e test on this branch before that moment?

right, let me remove that for now

fabriziopandini · 2021-03-08T16:12:56Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

@@ -143,6 +149,7 @@ presubmits:
    branches:
    # The script this job runs is not in all branches.
    - ^master$
+    - ^operator-0.4$


Same as above.

fabriziopandini · 2021-03-08T16:14:07Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

@@ -169,6 +176,7 @@ presubmits:
    branches:
    # The script this job runs is not in all branches.
    - ^master$
+    - ^operator-0.4$


Same as above.

alexander-demicev · 2021-03-11T10:03:34Z

I added a verify job for the operator since we are using a separate makefile for it

fabriziopandini · 2021-03-11T18:15:12Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

@@ -205,3 +210,25 @@ presubmits:
    annotations:
      testgrid-dashboards: sig-cluster-lifecycle-cluster-api
      testgrid-tab-name: capi-pr-e2e-k8s-latest-main
+  - name: pull-cluster-api-operator-verify


Why not using the same approach we are using for CAPD (calling make targets from a script)

https://github.com/kubernetes-sigs/cluster-api/blob/8bc65c3aa70c416b871b02bfe9cd31e17fd10737/scripts/ci-make.sh#L25?

This avoid to add complexity to test grid and it will make things to nicely fit when we are going to merge back on main

vincepri · 2021-03-16T19:08:41Z

/lgtm

fabriziopandini · 2021-03-17T21:09:28Z

/hold cancel

k8s-ci-robot · 2021-03-17T21:19:25Z

@alexander-demichev: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

key cluster-api-presubmits-main.yaml using file config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml

In response to this:

There was created a separate branch for developing new operator. This branch will later be merged in main but now it needs the same CI jobs.

Fixes: kubernetes-sigs/cluster-api#4269

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 5, 2021

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 5, 2021

k8s-ci-robot requested review from justinsb and timothysc March 5, 2021 10:27

k8s-ci-robot added area/config Issues or PRs related to code in /config area/jobs sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Mar 5, 2021

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 5, 2021

k8s-ci-robot assigned JoelSpeed Mar 5, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 5, 2021

alexander-demicev mentioned this pull request Mar 8, 2021

Enable CI jobs for operator branch kubernetes-sigs/cluster-api#4269

Closed

fabriziopandini reviewed Mar 8, 2021

View reviewed changes

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 8, 2021

vincepri approved these changes Mar 8, 2021

View reviewed changes

k8s-ci-robot assigned vincepri Mar 8, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2021

fabriziopandini reviewed Mar 8, 2021

View reviewed changes

Add operator branch to main jobs

9fc679a

alexander-demicev force-pushed the operator-jobs branch from 0e2189d to 9fc679a Compare March 10, 2021 22:00

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021

alexander-demicev mentioned this pull request Mar 11, 2021

🌱 Make CI scripts work with operator kubernetes-sigs/cluster-api#4289

Merged

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 11, 2021

fabriziopandini reviewed Mar 11, 2021

View reviewed changes

Add CAPI operator verify task

c3d6959

alexander-demicev force-pushed the operator-jobs branch from 247e5a7 to c3d6959 Compare March 15, 2021 09:39

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 15, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 16, 2021

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 17, 2021

k8s-ci-robot merged commit aa7a3b0 into kubernetes:master Mar 17, 2021

k8s-ci-robot added this to the v1.21 milestone Mar 17, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CAPI: Add operator branch to main jobs #21182

CAPI: Add operator branch to main jobs #21182

alexander-demicev commented Mar 5, 2021 •

edited

Loading

k8s-ci-robot commented Mar 5, 2021

JoelSpeed commented Mar 5, 2021

fabriziopandini left a comment

vincepri left a comment

k8s-ci-robot commented Mar 8, 2021

vincepri commented Mar 8, 2021

fabriziopandini left a comment

fabriziopandini Mar 8, 2021

fabriziopandini Mar 8, 2021

alexander-demicev Mar 9, 2021

fabriziopandini Mar 9, 2021

alexander-demicev Mar 9, 2021

fabriziopandini Mar 8, 2021

fabriziopandini Mar 8, 2021

alexander-demicev commented Mar 11, 2021

fabriziopandini Mar 11, 2021

vincepri commented Mar 16, 2021

fabriziopandini commented Mar 17, 2021

k8s-ci-robot commented Mar 17, 2021

CAPI: Add operator branch to main jobs #21182

CAPI: Add operator branch to main jobs #21182

Conversation

alexander-demicev commented Mar 5, 2021 • edited Loading

k8s-ci-robot commented Mar 5, 2021

JoelSpeed commented Mar 5, 2021

fabriziopandini left a comment

Choose a reason for hiding this comment

vincepri left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Mar 8, 2021

vincepri commented Mar 8, 2021

fabriziopandini left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-demicev commented Mar 11, 2021

Choose a reason for hiding this comment

vincepri commented Mar 16, 2021

fabriziopandini commented Mar 17, 2021

k8s-ci-robot commented Mar 17, 2021

alexander-demicev commented Mar 5, 2021 •

edited

Loading