Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFE-1007: CI configuration for openshift/coredns-ocp-dnsnameresolver #46743

Merged

Conversation

arkadeepsen
Copy link
Contributor

This PR adds the CI configuration for the new repo openshift/coredns-ocp-dnsnameresolver.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 13, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 13, 2023

@arkadeepsen: This pull request references CFE-1007 which is a valid jira issue.

In response to this:

This PR adds the CI configuration for the new repo openshift/coredns-ocp-dnsnameresolver.

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.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2023
@candita
Copy link
Contributor

candita commented Dec 20, 2023

/assign @alebedev87
/assign @gcs278

@bear-redhat
Copy link
Contributor

/uncc
already approved

@openshift-ci openshift-ci bot removed the request for review from bear-redhat December 21, 2023 13:25
Copy link
Contributor

@alebedev87 alebedev87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, the CI job can be simplified quite well. Also, can you run a rehearsal?

Comment on lines 1 to 5
base_images:
base:
name: "4.16"
namespace: ocp
tag: base
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the base_images? There is no images section in this CI job. That is, no images is built by the job. Normally we use base_images in images section to make some substitutions in Dockerfile's FROM instruction.

Comment on lines 11 to 13
promotion:
name: "4.16"
namespace: ocp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No image is built by this CI job, so there is nothing to promote.

Comment on lines 14 to 23
releases:
initial:
integration:
name: "4.16"
namespace: ocp
latest:
integration:
include_built_images: true
name: "4.16"
namespace: ocp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This job doesn't need OCP for any of the test steps.

requests:
cpu: 100m
memory: 200Mi
tests:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that it may make sense to add verify step to run go fmt and other commands.

lgtm:
- repos:
- openshift/coredns-ocp-dnsnameresolver
review_acts_as_lgtm: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is better to be set to false because this allows people not mentioned in the OWNERS file to give approvals to PRs.

- commandHelpLink: ""
repos:
- openshift/coredns-ocp-dnsnameresolver
require_self_approval: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This setting reduces the number of people required to make the PR pass from 2 to 1 if the creator is from the OWNERS list. I think it's better to have an explicit approval and LGTM labels from 2 different reviews, especially for a code shared between teams.

@@ -0,0 +1,13 @@
approve:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another setting which can be useful is ignore_review_state: true (ref). It disallows the GitHub review to impact the approvals of the PR.

@openshift-ci openshift-ci bot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jan 18, 2024
@alebedev87
Copy link
Contributor

LGTM, just waiting for the owner file's problem to be fixed.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2024
@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2024
@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels Jan 18, 2024
@alebedev87
Copy link
Contributor

/lgtm
/hold

Holding for @gcs278 to have a look.

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jan 18, 2024
@arkadeepsen
Copy link
Contributor Author

/pj-rehearse

@arkadeepsen
Copy link
Contributor Author

@alebedev87 I ran pj-rehearse but the tests are failing because the repo is empty and the Makefile is not there. I was referring to this issue earlier.

@alebedev87
Copy link
Contributor

@arkadeepsen: sorry I misunderstood. Yes, you are right, the initial PR is not merged yet, the rehearsal won't work. Thanks for following up on this one!

Copy link
Contributor

@gcs278 gcs278 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have any major concerns, just questions.

@@ -0,0 +1,14 @@
tide:
queries:
- labels:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason these other labels are not included?

    labels:
    - approved
    - backport-risk-assessed
    - cherry-pick-approved
    - jira/valid-bug
    - jira/valid-reference                                                                     
    - lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing that out. I have now used the prow config for tide from cluster-dns-operator directory. The reference for each field can be found here: https://docs.prow.k8s.io/docs/components/core/tide/config/#queries

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed the simple labeling strategy too but I didn't ask to align it with the other NetEdge repos for the reason of simplifying the initial development process. However here I may be talking about 3 labels more: docs/qe/px approved.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. I don't mind if you want add the label requirements now, or later. But I think we can apply all the labels we need manually if you want to shortcut the labels during development.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm:
- repos:
- openshift/coredns-ocp-dnsnameresolver
plugins:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we are not including the restricted_labels? I don't totally understand this repo, but does our normal NE label process apply to it?

label:
  restricted_labels:
    openshift/coredns:
    - allowed_users:
      - candita
      - Miciah
      label: backport-risk-assessed
    - allowed_users:
      - lihongan
      - quarterpin
      - melvinjoseph86
      - ShudiLi
      assign_on:
      - label: backport-risk-assessed
      label: cherry-pick-approved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated the config for labels as well for the NE process.

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jan 19, 2024
Comment on lines 4 to 32
- community-4.6
- community-4.7
- openshift-4.10
- openshift-4.11
- openshift-4.12
- openshift-4.13
- openshift-4.14
- openshift-4.2
- openshift-4.3
- openshift-4.4
- openshift-4.5
- openshift-4.6
- openshift-4.7
- openshift-4.8
- openshift-4.9
- release-4.0
- release-4.10
- release-4.11
- release-4.12
- release-4.13
- release-4.14
- release-4.2
- release-4.3
- release-4.4
- release-4.5
- release-4.6
- release-4.7
- release-4.8
- release-4.9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why all these branches for a new repository?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These branches are used in all the prowconfig files in different directories. I checked most of them. I used the prowconfig file from the cluster-dns-operator as that will adhere to the labeling used by the NE team.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, for the cluster-dns-operator they make sense as the operator existed from the very first version of OCP 4. We don't have these branches for the new plugin. This may be misleading keeping the old release branches like if the plugin was delivered for those releases too or like it has those branches. For the new releases though, I suppose that ART automation will add new branches.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw this config is for the backports as well as the config right after it (openshift-4.15). It feels a little premature to add the CI config for the backports while we don't have the initial release yet. For the moment, we cannot say which releases we may need to backport something to. I think I'd prefer to keep the CI config to the necessary minimum - main branch only, and add new things when we need them. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. We can always update the file as and when required. I will make the appropriate changes.

Comment on lines 106 to 109
- feature-es6x
- feature-prom-connector
- main
- master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How all these branches relate to the dnsnamesresolver plugin?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a common format for prowconfig across repos belonging to openshift. Most of the repos don't have the branches. The prowconfig files are updated through automation during branch cut and release. I am guessing that this format may have something to do with the automation.

- openshift/coredns-ocp-dnsnameresolver
- includedBranches:
- main
- master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why master branch? The plugin's default branch is main.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

label: backport-risk-assessed
- allowed_users:
- lihongan
- quarterpin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

quarterpin you can remove this one, as he is no more with the organization

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @melvinjoseph86 . Will update it. Should there be anybody else who needs to be added here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are only three now...

@openshift-ci-robot openshift-ci-robot removed the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jan 25, 2024
- main
labels:
- approved
- jira/valid-reference
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we have jira/valid-bug label too here? This part seems to be for the bugs.

@alebedev87
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2024
Copy link
Contributor

openshift-ci bot commented Jan 25, 2024

@arkadeepsen: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/openshift/coredns-ocp-dnsnameresolver/main/verify 87c43e7 link unknown /pj-rehearse pull-ci-openshift-coredns-ocp-dnsnameresolver-main-verify
ci/rehearse/openshift/coredns-ocp-dnsnameresolver/main/unit 87c43e7 link unknown /pj-rehearse pull-ci-openshift-coredns-ocp-dnsnameresolver-main-unit
ci/rehearse/openshift/coredns-ocp-dnsnameresolver/main/build 87c43e7 link unknown /pj-rehearse pull-ci-openshift-coredns-ocp-dnsnameresolver-main-build

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@arkadeepsen: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-coredns-ocp-dnsnameresolver-main-build openshift/coredns-ocp-dnsnameresolver presubmit Presubmit changed
pull-ci-openshift-coredns-ocp-dnsnameresolver-main-unit openshift/coredns-ocp-dnsnameresolver presubmit Presubmit changed
pull-ci-openshift-coredns-ocp-dnsnameresolver-main-verify openshift/coredns-ocp-dnsnameresolver presubmit Presubmit changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@alebedev87
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2024
@arkadeepsen
Copy link
Contributor Author

@gcs278 can you please again take a look? If everything is fine then we can merge this PR.

@arkadeepsen
Copy link
Contributor Author

Reapplying

/pj-rehearse ack

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jan 25, 2024
@gcs278
Copy link
Contributor

gcs278 commented Jan 25, 2024

Yea I'll admit I don't totally understand all of the mechanisms/plugins/config here, but look at the comparisons to our existing config seem to mostly align. This repo also not in production yet, so I think we still have time to tweak things if we get them wrong.
/lgtm
/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 25, 2024
Copy link
Contributor

openshift-ci bot commented Jan 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alebedev87, arkadeepsen, gcs278

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:

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

@alebedev87
Copy link
Contributor

/retest

1 similar comment
@arkadeepsen
Copy link
Contributor Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 307e075 into openshift:master Jan 29, 2024
20 checks passed
Copy link
Contributor

openshift-ci bot commented Jan 29, 2024

@arkadeepsen: Updated the following 2 configmaps:

  • plugins configmap in namespace ci at cluster app.ci using the following files:
    • key core-services-prow-02_config-openshift-coredns-ocp-dnsnameresolver-_pluginconfig.yaml using file core-services/prow/02_config/openshift/coredns-ocp-dnsnameresolver/_pluginconfig.yaml
  • config configmap in namespace ci at cluster app.ci using the following files:
    • key core-services-prow-02_config-openshift-coredns-ocp-dnsnameresolver-_prowconfig.yaml using file core-services/prow/02_config/openshift/coredns-ocp-dnsnameresolver/_prowconfig.yaml

In response to this:

This PR adds the CI configuration for the new repo openshift/coredns-ocp-dnsnameresolver.

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.

Simranpal pushed a commit to Simranpal/release that referenced this pull request Feb 1, 2024
…penshift#46743)

* CI configuration for openshift/coredns-ocp-dnsnameresolver

* Add OWNERS file for openshift/coredns-ocp-dnsnameresolver

* Updated CI configuration and OWNERS file

* Executed "make jobs" and updated correct username in OWNERS file

* Update pluginconfig and prowconfig for correct label and tide configurations respectively

* Fixed the repo name

* Update pluginconfig and prowconfig

* Added jira/valid-bug to prowconfig
afaranha pushed a commit to afaranha/release that referenced this pull request Feb 6, 2024
…penshift#46743)

* CI configuration for openshift/coredns-ocp-dnsnameresolver

* Add OWNERS file for openshift/coredns-ocp-dnsnameresolver

* Updated CI configuration and OWNERS file

* Executed "make jobs" and updated correct username in OWNERS file

* Update pluginconfig and prowconfig for correct label and tide configurations respectively

* Fixed the repo name

* Update pluginconfig and prowconfig

* Added jira/valid-bug to prowconfig
memodi pushed a commit to memodi/release that referenced this pull request Mar 14, 2024
…penshift#46743)

* CI configuration for openshift/coredns-ocp-dnsnameresolver

* Add OWNERS file for openshift/coredns-ocp-dnsnameresolver

* Updated CI configuration and OWNERS file

* Executed "make jobs" and updated correct username in OWNERS file

* Update pluginconfig and prowconfig for correct label and tide configurations respectively

* Fixed the repo name

* Update pluginconfig and prowconfig

* Added jira/valid-bug to prowconfig
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
8 participants