Skip to content

Do not remove everything from resources directory#667

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:mainfrom
FilipB:fix-merge-upstream-script
Feb 4, 2026
Merged

Do not remove everything from resources directory#667
openshift-merge-bot[bot] merged 1 commit intoopenshift-service-mesh:mainfrom
FilipB:fix-merge-upstream-script

Conversation

@FilipB
Copy link
Copy Markdown

@FilipB FilipB commented Feb 4, 2026

istio-ecosystem#1561 added new file to resources directory so we can't remove everything. We want to remove just charts.

istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
Copy link
Copy Markdown
Collaborator

@fjglira fjglira left a comment

Choose a reason for hiding this comment

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

LGTM

@FilipB
Copy link
Copy Markdown
Author

FilipB commented Feb 4, 2026

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Feb 4, 2026

@FilipB: Overrode contexts on behalf of FilipB: ci/prow/ocp-4.20-e2e-ocp, ci/prow/ocp-4.20-e2e-ocp-arm, ci/prow/ocp-4.21-e2e-ocp

Details

In response to this:

/override ci/prow/ocp-4.20-e2e-ocp ci/prow/ocp-4.20-e2e-ocp-arm ci/prow/ocp-4.21-e2e-ocp

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 6f4d74f into openshift-service-mesh:main Feb 4, 2026
8 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown

In response to a cherrypick label: #667 failed to apply on top of branch "release-3.2":

Applying: Do not remove everything from resources directory
Using index info to reconstruct a base tree...
M	ossm/merge_upstream.sh
Falling back to patching base and 3-way merge...
Auto-merging ossm/merge_upstream.sh
CONFLICT (content): Merge conflict in ossm/merge_upstream.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Do not remove everything from resources directory

@openshift-cherrypick-robot
Copy link
Copy Markdown

In response to a cherrypick label: #667 failed to apply on top of branch "release-3.3":

Applying: Do not remove everything from resources directory
Using index info to reconstruct a base tree...
A	ossm/merge_upstream.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): ossm/merge_upstream.sh deleted in HEAD and modified in Do not remove everything from resources directory. Version Do not remove everything from resources directory of ossm/merge_upstream.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Do not remove everything from resources directory

@FilipB FilipB deleted the fix-merge-upstream-script branch March 18, 2026 05:56
openshift-merge-bot bot pushed a commit that referenced this pull request Mar 18, 2026
istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
openshift-merge-bot bot pushed a commit that referenced this pull request Mar 18, 2026
istio-ecosystem#1561 added new
file to resources directory so we can't remove everything. We want to
remove just charts.
dcillera pushed a commit to dcillera/sail-operator that referenced this pull request Mar 19, 2026
…e-mesh#667) (openshift-service-mesh#669) (openshift-service-mesh#254)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
dcillera pushed a commit to dcillera/sail-operator that referenced this pull request Mar 19, 2026
…e-mesh#667) (openshift-service-mesh#669)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.



(cherry picked from commit 148eb64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>
dcillera pushed a commit to dcillera/sail-operator that referenced this pull request Mar 19, 2026
* upstream/release-1.0:
  Make environment variable consistent (openshift-service-mesh#664)
  Add multi control plane e2e tests (openshift-service-mesh#610) (openshift-service-mesh#670)
  Ensure e2e tests use the correct versions yaml file (openshift-service-mesh#667) (openshift-service-mesh#669)
  Add version alias support  (openshift-service-mesh#566) (openshift-service-mesh#662)
  Add missing link for: Example using the RevisionBased strategy and an IstioRevisionTag

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
hhovsepy pushed a commit to hhovsepy/sail-operator that referenced this pull request Apr 8, 2026
…e-mesh#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
hhovsepy pushed a commit to hhovsepy/sail-operator that referenced this pull request Apr 8, 2026
* e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Clean up multicluister test

Signed-off-by: Francisco H <frherrer@redhat.com>

Adding primary remote multicluster e2e test

Signed-off-by: Francisco H <frherrer@redhat.com>

Ensure e2e tests use the correct versions yaml file (openshift-service-mesh#667)

We use `-ldflags` to set the `istioversion.versionsFilename` variable, but this only works when building the binary. It doesn't work when running ginkgo-based e2e tests. When the `versionsFilename` is not set via ldflags, it will now use the environment variable `VERSIONS_YAML_FILE`. If this env var isn't set, we default to `versions.yaml`.

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

e2e multicluster test improve

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix lint errors

Signed-off-by: Francisco H <frherrer@redhat.com>

Delete references to bookinfo on multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

Fix change package on external multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Apply suggestions from code review

Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
Signed-off-by: Francisco H <frherrer@redhat.com>

* Changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* More changes from review

Signed-off-by: Francisco H <frherrer@redhat.com>

* Add tag to common file in multicluster test

Signed-off-by: Francisco H <frherrer@redhat.com>

* Delete duplicated Label

Signed-off-by: Francisco H <frherrer@redhat.com>

---------

Signed-off-by: Francisco H <frherrer@redhat.com>
Co-authored-by: Nick Fox <6226732+nrfox@users.noreply.github.com>
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