OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests by gcs278 · Pull Request #575 · openshift/router

gcs278 · 2024-04-15T22:04:31Z

Add --debug-upgrade-validation-force-add-condition and --debug-upgrade-validation-force-remove-condition as arguments to the
openshift-router. These force add or force remove the UnservableInFutureVersions condition to allow for an E2E test to do contention testing on a condition-level.

Origin Test PR that these arguments support: openshift/origin#28710

Miciah · 2024-04-22T17:26:37Z

pkg/cmd/infra/router/router.go

+	flag.BoolVar(&o.UpgradeValidationForceAddCondition, "upgrade-validation-force-add-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_ADD_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly add the UnservableInFutureVersions condition.")
+	flag.BoolVar(&o.UpgradeValidationForceRemoveCondition, "upgrade-validation-force-remove-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_REMOVE_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly remove the UnservableInFutureVersions condition.")


Adding these options that will only be used for a specific E2E test seems a little odd to me. However, other than being a bit conspicuous, this seems well contained and important for being able to test and have confidence in the conflict resolution logic. What do you think about adding "debug" or "for testing" to the options or their descriptions?

Suggested change

flag.BoolVar(&o.UpgradeValidationForceAddCondition, "upgrade-validation-force-add-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_ADD_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly add the UnservableInFutureVersions condition.")

flag.BoolVar(&o.UpgradeValidationForceRemoveCondition, "upgrade-validation-force-remove-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_REMOVE_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly remove the UnservableInFutureVersions condition.")

flag.BoolVar(&o.UpgradeValidationForceAddCondition, "debug-upgrade-validation-force-add-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_ADD_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly add the UnservableInFutureVersions condition. For testing purposes only.")

flag.BoolVar(&o.UpgradeValidationForceRemoveCondition, "debug-upgrade-validation-force-remove-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_REMOVE_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly remove the UnservableInFutureVersions condition. For testing purposes only.")

Sorry forgot to respond. I agree with being more verbose about debugging. Done.

Miciah · 2024-04-22T17:28:32Z

I had one comment, but it doesn't need to block this PR if you and Andy are good with the PR as is: #575 (comment).
/approve
/lgtm
/hold
for @frobware.

openshift-ci · 2024-04-22T17:29:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [Miciah]

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

Miciah · 2024-04-22T21:02:23Z

/retest-required

Add --debug-upgrade-validation-force-add-condition and --debug-upgrade-validation-force-remove-condition as arguments to the openshift-router. These force add or force remove the UnservableInFutureVersions condition to allow for an E2E test to do contention testing on a condition-level. For debugging and testing purposes only.

Miciah · 2024-04-23T02:41:42Z

/lgtm

frobware · 2024-04-23T08:19:27Z

/hold cancel

frobware · 2024-04-23T08:35:51Z

/retest

openshift-ci · 2024-04-23T11:58:12Z

@gcs278: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

frobware · 2024-04-23T12:07:24Z

/retitle "OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests"

openshift-ci-robot · 2024-04-23T12:07:56Z

@gcs278: This pull request references Jira Issue OCPBUGS-26498, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.16.0) matches configured target version for branch (4.16.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @ShudiLi

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

Details

In response to this:

Add --debug-upgrade-validation-force-add-condition and --debug-upgrade-validation-force-remove-condition as arguments to the
openshift-router. These force add or force remove the UnservableInFutureVersions condition to allow for an E2E test to do contention testing on a condition-level.

Origin Test PR that these arguments support: openshift/origin#28710

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-04-23T12:10:58Z

@gcs278: Jira Issue OCPBUGS-26498: Some pull requests linked via external trackers have merged:

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

openshift/cluster-ingress-operator#1014 is open

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-26498 has not been moved to the MODIFIED state.

Details

In response to this:

Add --debug-upgrade-validation-force-add-condition and --debug-upgrade-validation-force-remove-condition as arguments to the
openshift-router. These force add or force remove the UnservableInFutureVersions condition to allow for an E2E test to do contention testing on a condition-level.

Origin Test PR that these arguments support: openshift/origin#28710

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 openshift-eng/jira-lifecycle-plugin repository.

Miciah · 2024-04-23T13:20:20Z

/retitle OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests

(Without the double-quotes.)

openshift-bot · 2024-04-23T16:29:25Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-haproxy-router-base-container-v4.17.0-202404231146.p0.gd2d6892.assembly.stream.el9 for distgit ose-haproxy-router-base.
All builds following this will include this PR.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 15, 2024

openshift-ci bot requested review from Miciah and alebedev87 April 15, 2024 22:05

gcs278 mentioned this pull request Apr 15, 2024

OCPBUGS-26498: Add test for UpgradeValidation contention openshift/origin#28710

Merged

gcs278 force-pushed the OCPBUGS-26498-upgradeable-status-E2E-args branch from cd63d3d to 2134bcf Compare April 16, 2024 01:45

gcs278 mentioned this pull request Apr 17, 2024

OCPBUGS-26498: Upgrade Validation plugin for SHA1 certs #555

Merged

gcs278 force-pushed the OCPBUGS-26498-upgradeable-status-E2E-args branch from 2134bcf to 1611fb4 Compare April 22, 2024 14:19

gcs278 changed the title ~~[WIP] Add Upgrade Validation force arguments for running E2E tests~~ Add Upgrade Validation force arguments for running E2E tests Apr 22, 2024

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 Apr 22, 2024

Miciah reviewed Apr 22, 2024

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2024

openshift-ci bot assigned Miciah Apr 22, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 22, 2024

gcs278 force-pushed the OCPBUGS-26498-upgradeable-status-E2E-args branch from 1611fb4 to 0ff5da4 Compare April 23, 2024 02:06

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2024

openshift-ci bot changed the title ~~Add Upgrade Validation force arguments for running E2E tests~~ "OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests" Apr 23, 2024

openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Apr 23, 2024

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 23, 2024

openshift-ci bot requested a review from ShudiLi April 23, 2024 12:08

openshift-merge-bot bot merged commit d2d6892 into openshift:master Apr 23, 2024

openshift-ci bot changed the title ~~"OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests"~~ OCPBUGS-26498: Add Upgrade Validation force arguments for running E2E tests Apr 23, 2024

gcs278 mentioned this pull request May 22, 2024

[release-4.15] OCPBUGS-28928: Upgrade Validation plugin for SHA1 certs #585

Merged

		flag.BoolVar(&o.UpgradeValidationForceAddCondition, "upgrade-validation-force-add-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_ADD_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly add the UnservableInFutureVersions condition.")
		flag.BoolVar(&o.UpgradeValidationForceRemoveCondition, "upgrade-validation-force-remove-condition", isTrue(env("UPGRADE_VALIDATION_FORCE_REMOVE_CONDITION", "")), "If set, then the upgrade validation plugin will forcibly remove the UnservableInFutureVersions condition.")

Conversation

gcs278 commented Apr 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Miciah Apr 22, 2024

Choose a reason for hiding this comment

Uh oh!

gcs278 Apr 23, 2024

Choose a reason for hiding this comment

Uh oh!

Miciah commented Apr 22, 2024

Uh oh!

openshift-ci bot commented Apr 22, 2024

Uh oh!

Miciah commented Apr 22, 2024

Uh oh!

Miciah commented Apr 23, 2024

Uh oh!

frobware commented Apr 23, 2024

Uh oh!

frobware commented Apr 23, 2024

Uh oh!

openshift-ci bot commented Apr 23, 2024

Uh oh!

frobware commented Apr 23, 2024

Uh oh!

openshift-ci-robot commented Apr 23, 2024

Uh oh!

openshift-ci-robot commented Apr 23, 2024

Uh oh!

Miciah commented Apr 23, 2024

Uh oh!

openshift-bot commented Apr 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gcs278 commented Apr 15, 2024 •

edited

Loading