Skip to content

ci-operator/config/openshift: Decouple Cincinnati ecosystem from OpenShift branching#31237

Merged
openshift-merge-robot merged 1 commit into
openshift:masterfrom
wking:decouple-cincinnati-ecosystem-from-openshift-branching
Aug 22, 2022
Merged

ci-operator/config/openshift: Decouple Cincinnati ecosystem from OpenShift branching#31237
openshift-merge-robot merged 1 commit into
openshift:masterfrom
wking:decouple-cincinnati-ecosystem-from-openshift-branching

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Aug 10, 2022

graph-data only has a development branch. Cincinnati and its operator recently pivoted to a similar model, releasing an OpenShift Update Service 5.0 on 2022-08-03 based on the master branches. This commit rips out all the old release-* stuff, and also:

  • Drops releases in favor of cluster claims 1, because we are decoupled from the OpenShift core and do not need to install a fresh cluster for our testing.

  • Drops promotion. We'd already had most of our images in exclude_images, so not much change in terms of actually-promoted images. But dropping the promotion property opts us out of OpenShift branching.

@openshift-ci 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 Aug 10, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 10, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@wking wking marked this pull request as ready for review August 10, 2022 20:35
@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 Aug 10, 2022
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2022
@wking wking force-pushed the decouple-cincinnati-ecosystem-from-openshift-branching branch 2 times, most recently from be50523 to 7c95530 Compare August 11, 2022 13:53
@openshift-ci openshift-ci Bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2022
@wking wking force-pushed the decouple-cincinnati-ecosystem-from-openshift-branching branch 2 times, most recently from 79ca6aa to cec0f70 Compare August 11, 2022 14:46
@PratikMahajan
Copy link
Copy Markdown
Contributor

looks like we need to fix cincinnati tests before merging this PR

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 11, 2022

Hmm, yeah, both have no matches for kind "Template" in version "v1". But we've had v1 Templates for years. Ah, but our apiVersion declarations like this one are missing the template.openshift.io group information. Unclear to me why this pivot to cluster pools changes anything, but 🤷 I can try adding the group information...

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 11, 2022

I've filed openshift/cincinnati#727, adding the group information to the Template apiVersion.

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 11, 2022

openshift/cincinnati#727 merged.

/test pj-rehearse

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 12, 2022

Looks like the next tweak we need is dropping all namespaces, to avoid:

AllNamespaces InstallModeType not supported, cannot configure to watch all namespaces

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 12, 2022

openshift/cincinnati#728 will hopefully address the AllNamespaces issue.

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 19, 2022

openshift/cincinnati#719 merged.

/retest

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 20, 2022

Two rehearsals had:

could not determine image pull spec for image stable:cincinnati-operator on step e2e-test

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2022
…Shift branching

graph-data only has a development branch.  Cincinnati and its operator
recently pivoted to a similar model, releasing an OpenShift Update
Service 5.0 on 2022-08-03 [1] based on the master branches.  This
commit rips out all the old release-* stuff, and also:

* Drops 'releases' in favor of cluster claims [2], because we are
  decoupled from the OpenShift core and do not need to install a fresh
  cluster for our testing.

* Drops 'promotion'.  We'd already had most of our images in
  exclude_images, so not much change in terms of actually-promoted
  images.  But dropping the promotion property opts us out of
  OpenShift branching [3].

* Pivots cincinnati-operator from 'stable' to 'pipeline' sources, as
  suggested by [4]:

    pipeline	...output images as defined in images...
    ...
    stable	Same as [stable-<name>], but for the release:latest release payload. Appropriate tags are overridden using the container images built during the test.

  not entirely clear to me why "Appropriate tags are overridden using
  the container images" doesn't cover me here.  Possibly because I
  dropped the 'promotion' block.  But without this change I get
  failures like [5]:

    could not determine image pull spec for image stable:cincinnati-operator on step e2e-test

[1]: https://access.redhat.com/errata/RHEA-2022:5871
[2]: https://docs.ci.openshift.org/docs/architecture/ci-operator/#testing-with-a-cluster-from-a-cluster-pool
[3]: https://docs.ci.openshift.org/docs/architecture/branching/#how-do-i-opt-my-repository-into-automated-branching
[4]: https://docs.ci.openshift.org/docs/architecture/ci-operator/#referencing-images
[5]: openshift#31237 (comment)
@wking wking force-pushed the decouple-cincinnati-ecosystem-from-openshift-branching branch from cec0f70 to 2a23427 Compare August 20, 2022 01:04
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 20, 2022

@wking: The following test 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/cincinnati/master/e2e cec0f70ca734ea8e7074e727ab3ea7cc1e0830f7 link unknown /test pj-rehearse

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.

@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 20, 2022

graph-data e2e hit a Quay 500.

/retest

Copy link
Copy Markdown
Contributor

@PratikMahajan PratikMahajan 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 Aug 22, 2022
@bparees
Copy link
Copy Markdown
Contributor

bparees commented Aug 22, 2022

/approve
approving removal of mirrored image

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, PratikMahajan, 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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2022
@wking
Copy link
Copy Markdown
Member Author

wking commented Aug 22, 2022

Oops, CI is green, so this is stale.

/hold cancel

@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 Aug 22, 2022
@openshift-merge-robot openshift-merge-robot merged commit 45509b1 into openshift:master Aug 22, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Aug 22, 2022

@wking: Updated the following 24 configmaps:

  • ci-operator-4.11-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.11.yaml using file ``
    • key openshift-cincinnati-release-4.11.yaml using file ``
  • ci-operator-4.12-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.12.yaml using file ``
    • key openshift-cincinnati-release-4.12.yaml using file ``
  • job-config-master-presubmits configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-master-presubmits.yaml using file ci-operator/jobs/openshift/cincinnati-operator/openshift-cincinnati-operator-master-presubmits.yaml
    • key openshift-cincinnati-master-presubmits.yaml using file ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-presubmits.yaml
  • job-config-4.11 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.11-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.11-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.11-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.11-presubmits.yaml using file ``
  • job-config-4.12 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.12-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.12-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.12-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.12-presubmits.yaml using file ``
  • ci-operator-master-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-graph-data-master.yaml using file ci-operator/config/openshift/cincinnati-graph-data/openshift-cincinnati-graph-data-master.yaml
    • key openshift-cincinnati-operator-master.yaml using file ci-operator/config/openshift/cincinnati-operator/openshift-cincinnati-operator-master.yaml
    • key openshift-cincinnati-master.yaml using file ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml
    • key openshift-cincinnati-master__customrust.yaml using file ci-operator/config/openshift/cincinnati/openshift-cincinnati-master__customrust.yaml
  • ci-operator-4.10-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.10.yaml using file ``
    • key openshift-cincinnati-release-4.10.yaml using file ``
  • ci-operator-4.13-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.13.yaml using file ``
    • key openshift-cincinnati-release-4.13.yaml using file ``
  • ci-operator-4.6-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.6.yaml using file ``
    • key openshift-cincinnati-release-4.6.yaml using file ``
  • job-config-4.10 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.10-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.10-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.10-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.10-presubmits.yaml using file ``
  • job-config-4.4 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-release-4.4-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.4-presubmits.yaml using file ``
  • ci-operator-4.5-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.5.yaml using file ``
    • key openshift-cincinnati-release-4.5.yaml using file ``
  • ci-operator-4.7-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.7.yaml using file ``
    • key openshift-cincinnati-release-4.7.yaml using file ``
  • ci-operator-4.9-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.9.yaml using file ``
    • key openshift-cincinnati-release-4.9.yaml using file ``
  • ci-operator-4.4-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-release-4.4.yaml using file ``
  • job-config-master-postsubmits configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-graph-data-master-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-master-postsubmits.yaml using file ``
    • key openshift-cincinnati-master-postsubmits.yaml using file ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-postsubmits.yaml
  • job-config-4.5 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.5-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.5-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.5-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.5-presubmits.yaml using file ``
  • job-config-4.6 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.6-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.6-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.6-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.6-presubmits.yaml using file ``
  • job-config-4.9 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.9-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.9-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.9-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.9-presubmits.yaml using file ``
  • image-mirror-mappings configmap in namespace ci at cluster app.ci using the following files:
    • key mapping_origin_4_10 using file core-services/image-mirroring/openshift/mapping_origin_4_10
    • key mapping_origin_4_11 using file core-services/image-mirroring/openshift/mapping_origin_4_11
    • key mapping_origin_4_12 using file core-services/image-mirroring/openshift/mapping_origin_4_12
    • key mapping_origin_4_6 using file core-services/image-mirroring/openshift/mapping_origin_4_6
    • key mapping_origin_4_7 using file core-services/image-mirroring/openshift/mapping_origin_4_7
    • key mapping_origin_4_8 using file core-services/image-mirroring/openshift/mapping_origin_4_8
    • key mapping_origin_4_9 using file core-services/image-mirroring/openshift/mapping_origin_4_9
  • ci-operator-4.8-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.8.yaml using file ``
    • key openshift-cincinnati-release-4.8.yaml using file ``
  • job-config-4.13 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.13-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.13-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.13-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.13-presubmits.yaml using file ``
  • job-config-4.7 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.7-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.7-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.7-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.7-presubmits.yaml using file ``
  • job-config-4.8 configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-cincinnati-operator-release-4.8-postsubmits.yaml using file ``
    • key openshift-cincinnati-operator-release-4.8-presubmits.yaml using file ``
    • key openshift-cincinnati-release-4.8-postsubmits.yaml using file ``
    • key openshift-cincinnati-release-4.8-presubmits.yaml using file ``
Details

In response to this:

graph-data only has a development branch. Cincinnati and its operator recently pivoted to a similar model, releasing an OpenShift Update Service 5.0 on 2022-08-03 based on the master branches. This commit rips out all the old release-* stuff, and also:

  • Drops releases in favor of cluster claims 1, because we are decoupled from the OpenShift core and do not need to install a fresh cluster for our testing.

  • Drops promotion. We'd already had most of our images in exclude_images, so not much change in terms of actually-promoted images. But dropping the promotion property opts us out of OpenShift branching.

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 decouple-cincinnati-ecosystem-from-openshift-branching branch August 22, 2022 20:27
wking added a commit to wking/openshift-release that referenced this pull request Dec 2, 2022
…a image

We'd removed similar publishing in 45509b1
(ci-operator/config/openshift: Decouple Cincinnati ecosystem from
OpenShift branching, 2022-08-22, openshift#31237).  But it turns out some folks
are interested in a graph-data image that contains only YAML
configuration, even if those images are not produced by Red Hat's
internal build system and signed.  This commit asks Prow to build and
promote a from-scratch graph-data image for those consumers, using the
dockerfile_literal approach from [1] and the 'paths' approach from [1,2].

[1]: https://docs.ci.openshift.org/docs/architecture/ci-operator/#building-container-images
[2]: https://docs.openshift.com/container-platform/4.11/cicd/builds/creating-build-inputs.html#builds-image-source_creating-build-inputs
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.

4 participants