Skip to content

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.3#673

Merged
openshift-merge-bot[bot] merged 4 commits intoopenshift-service-mesh:release-3.3from
openshift-service-mesh-bot:main-release-3.3-merge_upstream_release-1.28-bdb9b2aa
Feb 11, 2026
Merged

Automator: merge upstream changes to openshift-service-mesh/sail-operator@release-3.3#673
openshift-merge-bot[bot] merged 4 commits intoopenshift-service-mesh:release-3.3from
openshift-service-mesh-bot:main-release-3.3-merge_upstream_release-1.28-bdb9b2aa

Conversation

@openshift-service-mesh-bot
Copy link
Copy Markdown

Generated by Automator - 2026-02-11T14:34:37+00:00

fjglira and others added 4 commits February 10, 2026 03:33
* Adding some fix for midstream CI execution



* Forcing avoid the use of external registry when CI mode is detected

Adding a new variable to handle properly the case



---------

Signed-off-by: Francisco Herrera <fjglira@gmail.com>
…ue (istio-ecosystem#1586)

* Adding TARGET_ARCH to tag definition when run on CI true

Adding export TAG=pr-- when CI is true to avoid race conditions when building and pushing multiple arch jobs at the same time

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* Fix lint

Fix lint error: Declare and assign separately to avoid masking return values

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* Fix indent

Fix indent

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

---------

Signed-off-by: Francisco Herrera <fjglira@gmail.com>
Co-authored-by: Francisco Herrera <fjglira@gmail.com>
…r inside OCP cl… (istio-ecosystem#1592)

* Improve scorecard test to avoid running on kind cluster inside OCP clusters

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* Adding default values to scorecard test

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* CHange from review

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

---------

Signed-off-by: Francisco Herrera <fjglira@gmail.com>
Co-authored-by: Francisco Herrera <fjglira@gmail.com>
* upstream/release-1.28:
  [release-1.28] Improve scorecard test to avoid running on kind cluster inside OCP cl… (istio-ecosystem#1592)
  [release-1.28] Adding TARGET_ARCH to tag definition when run on CI true (istio-ecosystem#1586)
  Fix e2e midstream CI mode (istio-ecosystem#1564) (istio-ecosystem#1582)
@openshift-ci openshift-ci bot added the size/L label Feb 11, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit a44b870 into openshift-service-mesh:release-3.3 Feb 11, 2026
1 check passed
dcillera pushed a commit to dcillera/sail-operator that referenced this pull request Mar 19, 2026
dcillera pushed a commit to dcillera/sail-operator that referenced this pull request Mar 19, 2026
* upstream/release-1.0:
  [Manual Cherry-pick to release-1.0 branch] e2e IstioRevisionTag test (openshift-service-mesh#683)
  [release-1.0] Updating dependencies and istio versions (openshift-service-mesh#673)

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants