Skip to content

ci-operator/jobs/openshift/cluster-version-operator: Metal optional on 4.7#17203

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
wking:fix-cvo-4.7-configurable-properties
Mar 26, 2021
Merged

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

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Mar 26, 2021

Fix:

$ 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.7-presubmits.yaml)
...
-ci/prow/e2e-metal-assisted false true
+ci/prow/e2e-metal-assisted true -

which dates back to when the job was created in 104130400a (#13446).

…n 4.7

Fix:

  $ 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.7-presubmits.yaml)
  ...
  -ci/prow/e2e-metal-assisted false true
  +ci/prow/e2e-metal-assisted true -

which dates back to when the job was created in 1041304
(ci-operator-prowgen --from-dir ./ci-operator/config --to-dir
./ci-operator/jobs, 2020-11-05, openshift#13446).
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2021
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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[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-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 0e471e6 into openshift:master Mar 26, 2021
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@wking: Updated the following 2 configmaps:

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

In response to this:

Fix:

$ 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.7-presubmits.yaml)
...
-ci/prow/e2e-metal-assisted false true
+ci/prow/e2e-metal-assisted true -

which dates back to when the job was created in 104130400a (#13446).

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.7-configurable-properties branch March 29, 2021 04:43
wking added a commit to wking/openshift-release that referenced this pull request Jun 21, 2021
…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.
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.

5 participants