Skip to content

ROX-27060: Konflux Backporting for 4.6, Batch 1#15814

Merged
msugakov merged 15 commits intorelease-4.6from
patch-1/release-4.6
Jun 25, 2025
Merged

ROX-27060: Konflux Backporting for 4.6, Batch 1#15814
msugakov merged 15 commits intorelease-4.6from
patch-1/release-4.6

Conversation

@ajheflin
Copy link
Contributor

@ajheflin ajheflin commented Jun 24, 2025 •
edited by msugakov
Loading

Description

Obtained via:

git cherry-pick f0f305ba dcea67d4 8057481d abe1847c ab3d7cc3 f713d92d 0207b35e 3ec3c390 5a1da92e 0b65ee28 86785c6f e4bcdff9 38516fad b80256bb 758f42d3

red-hat-konflux bot and others added 15 commits June 24, 2025 09:43
@red-hat-konflux @ajheflin
chore(deps): update konflux references (#13105)
33aeb2d
@red-hat-konflux @ajheflin
Red Hat Konflux update collector-full-retagged (#13174)
c5f7756
@red-hat-konflux @ajheflin
Red Hat Konflux update collector-slim-retagged (#13175)
f7e2bfe
@red-hat-konflux @ajheflin
Red Hat Konflux update scanner-retagged (#13176)
7dfc126
@red-hat-konflux @ajheflin
Red Hat Konflux update scanner-slim-retagged (#13177)
bf1787a
@red-hat-konflux @ajheflin
Red Hat Konflux update scanner-db-retagged (#13178)
d7fa103
@red-hat-konflux @ajheflin
Red Hat Konflux update scanner-db-slim-retagged (#13179)
bef1047
@red-hat-konflux @ajheflin
chore(deps): update quay.io/redhat-appstudio/build-trusted-artifacts:…
98ab475 
…latest docker digest to 81c4864 (#12939)
@red-hat-konflux @ajheflin
chore(deps): update registry.access.redhat.com/ubi9/skopeo docker dig…
1f84e13 
…est - abandoned (#13076)

 Conflicts:
	.tekton/central-db-build.yaml
	.tekton/main-build.yaml
	.tekton/operator-build.yaml
	.tekton/operator-bundle-build.yaml
	.tekton/roxctl-build.yaml
	.tekton/scanner-v4-build.yaml
	.tekton/scanner-v4-db-build.yaml
@msugakov @ajheflin
build: Update Konflux pipelines (#13194)
21daa5a
@tommartensen @msugakov @ajheflin
ROX-25572: prefetch dependencies for operator-bundle on Konflux (#13209)
682330b 
Co-authored-by: Misha Sugakov <537715+msugakov@users.noreply.github.com>
@msugakov @ajheflin
ROX-26889: Build main source image without Cachi2 artifact (#13238)
d0d8e2c
@msugakov @ajheflin
ROX-24468: Retag ScannerV2 and Collector containers (#13079)
574b6f1
@mclasmeier @ajheflin
ROX-26901: Add securitypolicies CRD to Konflux operator-bundle (#13264)
2b04338 
Co-authored-by: Moritz Clasmeier <mclasmeier@redhat.com>
@red-hat-konflux @ajheflin
chore(deps): update konflux references (#13173)
2aa2594
@openshift-ci
Copy link

openshift-ci bot commented Jun 24, 2025

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

@github-actions github-actions bot added area/operator backport PR to backport changes from master to release branch labels Jun 24, 2025
@ajheflin
Copy link
Contributor Author

ajheflin commented Jun 24, 2025 •
edited
Loading

This change is part of the following stack:

Change managed by git-spice.

This was referenced Jun 24, 2025
Merged
Merged
Merged
@ajheflin ajheflin marked this pull request as ready for review June 24, 2025 14:02
@ajheflin ajheflin requested review from a team as code owners June 24, 2025 14:02
@ajheflin ajheflin requested review from GrimmiMeloni and removed request for a team June 24, 2025 14:02
@ajheflin ajheflin added the konflux-build Run Konflux in PR. Push commit to trigger it. label Jun 24, 2025
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Jun 24, 2025 •
edited
Loading

Images are ready for the commit at 2aa2594.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.6.7-16-g6c5386b041.

This was referenced Jun 24, 2025
Merged
Merged
@codecov
Copy link

codecov bot commented Jun 24, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.42%. Comparing base (b5d1b87) to head (2aa2594).

Additional details and impacted files 
@@               Coverage Diff               @@
##           release-4.6   #15814      +/-   ##
===============================================
- Coverage        48.43%   48.42%   -0.01%     
===============================================
  Files             2470     2470              
  Lines           178528   178528              
===============================================
- Hits             86468    86458      -10     
- Misses           85108    85117       +9     
- Partials          6952     6953       +1
Flag Coverage Δ
go-unit-tests 48.42% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@stackrox stackrox deleted a comment from openshift-ci bot Jun 25, 2025
@msugakov msugakov added turbo-build Uses a faster path to images and removed turbo-build Uses a faster path to images labels Jun 25, 2025
@msugakov msugakov force-pushed the patch-1/release-4.6 branch from 6c5386b to 2aa2594 Compare June 25, 2025 09:01
@stackrox stackrox deleted a comment from openshift-ci bot Jun 25, 2025
@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

Having retag pipelines fail is ok for now.

@openshift-ci
Copy link

openshift-ci bot commented Jun 25, 2025

@ajheflin: 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/prow/ocp-4-12-qa-e2e-tests 2aa2594 link false /test ocp-4-12-qa-e2e-tests

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-sigs/prow repository. I understand the commands that are listed here.

@msugakov
Copy link
Contributor

msugakov commented Jun 25, 2025

OOM Kill in ecosystem-cert-preflight-checks / step-check-container
https://konflux-ui.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/ns/rh-acs-tenant/applications/acs/pipelineruns/main-on-push-bcn2k

Containers:
  step-check-container:
[...]
    State:          Terminated
      Reason:       OOMKilled
      Message:      [{"key":"StartedAt","value":"2025-06-25T10:09:16.201Z","type":3}]
      Exit Code:    255
      Started:      Wed, 25 Jun 2025 12:09:14 +0200
      Finished:     Wed, 25 Jun 2025 12:09:44 +0200
    Ready:          False
    Restart Count:  0
    Limits:
      memory:  2Gi
    Requests:
      cpu:     50m
      memory:  128Mi

msugakov
msugakov approved these changes Jun 25, 2025
View reviewed changes
Copy link
Contributor

@msugakov msugakov left a comment

Choose a reason for hiding this comment

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

Everything else looks ok and so I'm approving.

@msugakov msugakov merged commit 5420085 into release-4.6 Jun 25, 2025
145 of 168 checks passed
@msugakov msugakov deleted the patch-1/release-4.6 branch June 25, 2025 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@msugakov msugakov msugakov approved these changes

@tommartensen tommartensen Awaiting requested review from tommartensen

@GrimmiMeloni GrimmiMeloni Awaiting requested review from GrimmiMeloni GrimmiMeloni is a code owner automatically assigned from stackrox/install

Assignees

No one assigned

Labels

area/operator backport PR to backport changes from master to release branch konflux-build Run Konflux in PR. Push commit to trigger it.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ajheflin @rhacs-bot @msugakov @tommartensen @mclasmeier