[ci] Speculative s2i watcher deploy via OpenStackVersion - #443
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configurationConfiguration used: Central YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Central YAML (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review. 📝 WalkthroughSummary by CodeRabbit
WalkthroughThe Zuul configuration changes content-provider selection and adds speculative S2I Watcher image deployment jobs. GitHub-check and EDPM pipelines now wire operator content builds, S2I jobs, path filters, dependencies, and validation settings. ChangesWatcher S2I validation
Estimated code review effort: 3 (Moderate) | ~25 minutes Merge Risk: ⚪ Minimal · up to This change updates CI scheduling for speculative watcher deployments. No actionable merge-blocking risk remains based on the supplied evidence; it is merge-ready after normal checks. Sequence Diagram(s)sequenceDiagram
participant Pipeline as Zuul pipeline
participant Provider as Content provider
participant S2I as S2I image job
participant Deploy as Speculative deployment
Pipeline->>Provider: Build operator or S2I content
Pipeline->>S2I: Run watcher/watcher-base image build
Provider->>Deploy: Provide registry content
S2I->>Deploy: Provide speculative Watcher images
Deploy->>Deploy: Apply set_containers image mappings
Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset. |
| - watcher-operator-validation-epoxy-ocp4-18 | ||
|
|
||
| - project-template: | ||
| name: opendev-watcher-edpm-pipeline |
There was a problem hiding this comment.
we should probaly update this in place instead
so that we do not need to replace teh one we apply via rdo config to the watcher projects
you can just reband this as neded
e58c227 to
90bbf62
Compare
90bbf62 to
7d3b880
Compare
|
the pre-commit fix is ready but i will wait for the pipeline to end first :) |
| watcher-tempest-plugin. The s2i jobs are limited to watcher/ | ||
| source paths so client and tempest-plugin changes do not rebuild | ||
| containers (auto-detect would find no sources.txt match). | ||
| openstack-check: |
There was a problem hiding this comment.
i shoudl also methion that this template is updating
openstack-check: which is used to triger jobs agains upstream chagne to watcher on opendev before merge. so to test this end to end properly we need to create a DNM patch to watcher with a depend on agains this pr
but that will only work once we are updating the opendev-watcher-edpm-pipeline template instead since that is the one that is configured in teh rdo zuul ocnfig repo
There was a problem hiding this comment.
once the s2i provider is workign this can be reverted to the non meta version as well as it will only need to build the operator iamges
|
Build failed (check pipeline). Post ✔️ openstack-meta-content-provider-master SUCCESS in 3h 05m 40s |
|
recheck |
Inject s2i-built watcher images through cifmw_set_containers_images during edpm_prepare so they land in OpenStackVersion before the control plane deploys. github-check uses the non-meta operator content provider for operator images and appends the s2i registry as an extra insecure registry so CRC can pull both the operator catalog and watcher service images. Fold the s2i provider and deploy jobs into opendev-watcher-edpm-pipeline and limit them to watcher/ source paths so python-watcherclient and watcher-tempest-plugin keep EDPM-only. Depends-On: openstack-k8s-operators/s2i-openstack-containers#91 Depends-On: openstack-k8s-operators/ci-framework#4131 Co-authored-by: Cursor <cursoragent@cursor.com>
6f1c29b to
e33a358
Compare
|
@SeanMooney it works kinda well I guess :) the job has failed on tempest -> https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/logs//446/rdoproject.org/4462fe3ffce347febe61aab68ec091c1/controller/ci-framework-data/tests/test_operator/tempest-tests-tempest/tempest_results.html |
2 participants
Summary
s2i-speculative-deploy-test-watcherthat applies s2i-built watcher images to OpenStackVersion duringedpm_prepare(cifmw_set_containers_images), not via a latepre_testspatch.opendev-watcher-edpm-pipelineso RDO config does not need a second template. The s2i jobs are limited towatcher/source paths so python-watcherclient and watcher-tempest-plugin keep EDPM-only.watcher/watcher-baseand the consumer after the existing meta content provider.Test plan
s2i-openstack-container-content-providerands2i-speculative-deploy-test-watcheropenstack/watchercheck picks up the s2i jobs fromopendev-watcher-edpm-pipelinewith no extra project stanza in rdo configDepends-On: openstack-k8s-operators/s2i-openstack-containers#91
Depends-On: openstack-k8s-operators/ci-framework#4131