Skip to content

ci-operator/jobs/openshift/cluster-version-operator: Metal optional on 4.8 and 4.9#19513

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:fix-cvo-4.8-configurable-properties
Jun 21, 2021
Merged

ci-operator/jobs/openshift/cluster-version-operator: Metal optional on 4.8 and 4.9#19513
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:fix-cvo-4.8-configurable-properties

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Jun 21, 2021

Just like we did for 4.7 in 23982da (#17203), but now for 4.8 and 4.9. Using the previous procedure on the new releases:

$ disp() {
>   yaml2json < "ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-${1}" | jq -r '.presubmits | to_entries[].value[] | .context + " " + (.always_run | tostring) + " " + (.optional // "-" | tostring)' | sort
> }
$ diff -U0 <(disp master-presubmits.yaml) <(disp release-4.8-presubmits.yaml)
--- /dev/fd/63  2021-06-21 12:20:23.738355653 -0700
+++ /dev/fd/62  2021-06-21 12:20:23.739355653 -0700
@@ -4 +4 @@
-ci/prow/e2e-metal-assisted false true
+ci/prow/e2e-metal-assisted true -

And similarly for 4.9, but this commit fixes both.

…n 4.8 and 4.9

Just like we did for 4.7 in 23982da
(ci-operator/jobs/openshift/cluster-version-operator: Metal optional
on 4.7, 2021-03-26, openshift#17203), but now for 4.8 and 4.9.  Using the
previous procedure on the new releases:

  $ disp() {
  >   yaml2json < "ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-${1}" | jq -r '.presubmits | to_entries[].value[] | .context + " " + (.always_run | tostring) + " " + (.optional // "-" | tostring)' | sort
  > }
  $ diff -U0 <(disp master-presubmits.yaml) <(disp release-4.8-presubmits.yaml)
  --- /dev/fd/63  2021-06-21 12:20:23.738355653 -0700
  +++ /dev/fd/62  2021-06-21 12:20:23.739355653 -0700
  @@ -4 +4 @@
  -ci/prow/e2e-metal-assisted false true
  +ci/prow/e2e-metal-assisted true -

And similarly for 4.9, but this commit fixes both.
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 21, 2021
@openshift-ci openshift-ci Bot requested review from abhinavdahiya and vrutkovs June 21, 2021 19:26
Copy link
Copy Markdown
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

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:

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

@openshift-merge-robot openshift-merge-robot merged commit 2e6b848 into openshift:master Jun 21, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 21, 2021

@wking: Updated the following 2 configmaps:

  • job-config-4.8 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cluster-version-operator-release-4.8-presubmits.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml
  • job-config-4.9 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cluster-version-operator-release-4.9-presubmits.yaml using file ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.9-presubmits.yaml
Details

In response to this:

Just like we did for 4.7 in 23982da (#17203), but now for 4.8 and 4.9. Using the previous procedure on the new releases:

$ disp() {
>   yaml2json < "ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-${1}" | jq -r '.presubmits | to_entries[].value[] | .context + " " + (.always_run | tostring) + " " + (.optional // "-" | tostring)' | sort
> }
$ diff -U0 <(disp master-presubmits.yaml) <(disp release-4.8-presubmits.yaml)
--- /dev/fd/63  2021-06-21 12:20:23.738355653 -0700
+++ /dev/fd/62  2021-06-21 12:20:23.739355653 -0700
@@ -4 +4 @@
-ci/prow/e2e-metal-assisted false true
+ci/prow/e2e-metal-assisted true -

And similarly for 4.9, but this commit fixes both.

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.

@wking wking deleted the fix-cvo-4.8-configurable-properties branch June 21, 2021 20:20
wking added a commit to wking/openshift-release that referenced this pull request Jul 14, 2021
…operties

As discussed in e6b339e
(ci-operator/jobs/openshift/cluster-version-operator: Metal optional
on 4.8 and 4.9, 2021-07-21, openshift#19513) and similar work, the current
branch-forking procedure does not track these job properties which are
not covered by ci-operator/config/... entries.  This script makes it
easier to mass-repair suspect branches, based on agreement between
master and more reliable sibling branches.
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants