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

OCPBUGS-14561: Prevent ci/prow/versions from failing on PR against release-xxx #1969

Merged
merged 2 commits into from Jun 5, 2023

Conversation

machine424
Copy link
Contributor

…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 22, 2023

@machine424: This pull request references MON-3173 which is a valid jira issue.

In response to this:

…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 22, 2023
@@ -42,14 +42,6 @@ for c in $COMPONENTS; do
REMOTE="$(version_from_remote "$SLUG")"
REMOTE="${REMOTE#v}"

if [ "$REMOTE" = "" ] && [ "$INTERACTIVE" != "true" ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

EAFP, I don't think INTERACTIVE=true is used. This was a copy/paste from upstream.

now, we'll set the version to empty string if not able to fetch it, I think it's better than just using local versions.

Copy link
Contributor

Choose a reason for hiding this comment

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

I have never used INTERACTIVE afair.

Makefile Show resolved Hide resolved
@machine424 machine424 changed the base branch from release-4.14 to master May 22, 2023 10:17
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 22, 2023

@machine424: This pull request references MON-3173 which is a valid jira issue.

In response to this:

…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

Copy link
Contributor

@jan--f jan--f left a comment

Choose a reason for hiding this comment

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

/lgtm

@jan--f
Copy link
Contributor

jan--f commented May 24, 2023

/retest

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 24, 2023
@machine424 machine424 marked this pull request as draft May 25, 2023 10:11
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed lgtm Indicates that a PR is ready to be merged. labels May 25, 2023
…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.
@machine424 machine424 marked this pull request as ready for review May 25, 2023 10:13
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 25, 2023
@machine424
Copy link
Contributor Author

machine424 commented May 25, 2023

I added a commit to synchronize the versions as the bot that does it for thanos is disabled (the bot that symv thanos upstream->downstream is disabled).

this being said, I cannot find the config of the bot that syncs kubeRbacProxy.

kubeStateMetrics: 2.8.2
nodeExporter: 1.5.0
promLabelProxy: 0.6.0
prometheus: 2.43.0
prometheusAdapter: 0.10.0
prometheusOperator: 0.63.0
thanos: 0.31.0
thanos: 0.30.2
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please help me understand why addressing https://issues.redhat.com//browse/MON-3173 require versions to be changed?
If it isn't strictly needed, we shouldn't introduce changes to the product in a PR that addresses a development workflow tweak.

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 explained this in the separate commit where I make the change: the versions job was failing because these versions were not aligned with the ones that are already used in the product.

Copy link
Contributor

Choose a reason for hiding this comment

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

While I agree a separate PR would be ideal, I'd be happy to merge this since its in its own commit and clearly states why it was changed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If #1924 gets merged before this one, I'd discard my commit.

Copy link
Contributor

Choose a reason for hiding this comment

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

While I agree a separate PR would be ideal, I'd be happy to merge this since its in its own commit and clearly states why it was changed.

I am not against merging this but .. I wanted to understand why the versions are being downgraded. You might have more context than I do since the commit doesn't provide much information to me. It seems evident from the code that the versions are being downgraded but the message could be clearer about the reason behind this change.

E.g. Is it because the synbot disabled?

   Synchronize version of thanos as it was downgraded and the sync bot is disabled

    Synchronize version of kubeRbacProxy

the versions job was failing because these versions were not aligned with the ones that are already used in the product

If it isn't too much to ask for could you please incorporate that the message in the commit to indicate this. E.g.

Fix versions ci job

`versions` ci job is failing because of versions of thanos and kube-rbac-proxy 
are different to the ones that are already used in the product.  This patch fixes
that by setting the correct version of thanos and kube-rbac-proxy. 

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 adjusted the message (spent more time doing so than making the change itself :))

Maybe we should doc the versions job somewhere, otherwise we'll need to explain what it does on every commit, which just duplicates info which can become obsolete and that we can never adjust thus misleading anyone who may read this in 6 months.

I think sometimes it's better to have this sort of knowledge documented only once on a medium we can keep up to date. This way we can even use the same commit message than the bot https://github.com/openshift/cluster-monitoring-operator/pull/1924/commits in case we want to merge before it.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍 for better docs, I have something in the pipeline for rhobs/handbook.

i'd argue for merging this. We need a bug to move this anyway and #1924 would need yet another one. So lets combine them and skip the additional Jira interaction.

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 can help with rhobs/handbook, it falls within https://issues.redhat.com/browse/MON-3217

Copy link
Contributor

Choose a reason for hiding this comment

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

+1 on merging this. The question wasn't intended to block the merge.

@jan--f
Copy link
Contributor

jan--f commented May 26, 2023

/lgtm

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 30, 2023
The versions in jsonnet/versions.yaml are only used as metadata (added as Kube labels)
CMO is already using the appropriate versions from downstream.

The thanos downgrade is justified, see openshift/thanos#112
for more details.

Signed-off-by: Ayoub Mrini <amrini@redhat.com>
@sthaha
Copy link
Contributor

sthaha commented May 31, 2023

/retest-required

@jan--f
Copy link
Contributor

jan--f commented Jun 2, 2023

/label docs-approved
/label px-approved
/label qe-approved
Adding labels for a build tooling change.
/lgtm

@openshift-ci openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR lgtm Indicates that a PR is ready to be merged. labels Jun 2, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 2, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, machine424

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

@machine424
Copy link
Contributor Author

/retitle OCPBUGS-14561: Prevent ci/prow/versions from failing on PR against release-xxx

@openshift-ci openshift-ci bot changed the title MON-3173: Remove INTERACTIVE mode from hack/generate-versions.sh to s… OCPBUGS-14561: Prevent ci/prow/versions from failing on PR against release-xxx Jun 5, 2023
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 5, 2023
@openshift-ci-robot
Copy link
Contributor

@machine424: This pull request references Jira Issue OCPBUGS-14561, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

@machine424
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@machine424: This pull request references Jira Issue OCPBUGS-14561, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@machine424
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 5, 2023
@openshift-ci-robot
Copy link
Contributor

@machine424: This pull request references Jira Issue OCPBUGS-14561, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

/jira refresh

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 requested a review from juzhao June 5, 2023 08:46
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 5, 2023

@machine424: all tests passed!

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-merge-robot openshift-merge-robot merged commit cb167b1 into openshift:master Jun 5, 2023
15 checks passed
@openshift-ci-robot
Copy link
Contributor

@machine424: Jira Issue OCPBUGS-14561: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-14561 has not been moved to the MODIFIED state.

In response to this:

…implify.

Make hack/generate-versions.sh do nothing on PR that are not against the main branch as the components versions are only updated on the main branch (on release-xx branches, components kepp their versions when fixed)

Add a 'make check-versions' target to run the versions check. CI jobs will be updated to use this.

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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-merge-robot pushed a commit to openshift/release that referenced this pull request Jun 7, 2023
…onization (#39773)

Using tht target makes it easier to run test locally and it makes
logs clearer (git diff --exit-code didn't appear in logs before).

The target is introduced in openshift/cluster-monitoring-operator#1969
jtaleric pushed a commit to jtaleric/release that referenced this pull request Jun 9, 2023
…onization (openshift#39773)

Using tht target makes it easier to run test locally and it makes
logs clearer (git diff --exit-code didn't appear in logs before).

The target is introduced in openshift/cluster-monitoring-operator#1969
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. docs-approved Signifies that Docs has signed off on this PR jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. px-approved Signifies that Product Support has signed off on this PR qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants