NO-JIRA: Sync release-4.21 with upstream release-1.34#371
NO-JIRA: Sync release-4.21 with upstream release-1.34#371stephenfin wants to merge 5 commits intoopenshift:mainfrom
Conversation
Signed-off-by: moonek <gghonor@naver.com> Signed-off-by: Carlos da Silva <ces.eduardo98@gmail.com> Co-authored-by: moonek <gghonor@naver.com>
When using manila DHSS=true the network needs to be specified to allow using/creating the share. To allow e2e testing in a DHSS=true env I added an option to specify network via an environment variable keeping backward compatibility while allowing testing with DHSS=true Co-authored-by: eshulman2 <ellashulman1@gmail.com>
* tests: bump devstack to stable/2025.2 * tests: show loadbalancer tags in raw format --------- Co-authored-by: pýrus <kayrus@users.noreply.github.com>
…etes#3060) Co-authored-by: pýrus <kayrus@users.noreply.github.com>
Merge conflicts were due to the early backport of the Manila
shareAccessID stuff, which has since merged upstream.
❯ git diff upstream/release-1.35 -- \
':!vendor' ':!DOWNSTREAM_OWNERS' ':!DOWNSTREAM_OWNERS_ALIASES' \
':!.ci-operator.yaml' ':!.snyk' ':!images'
This re-adds support for a shareAccessID parameter but that's okay: the
operator takes care of this stuff for us.
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
openshift-ci-robot
added
the
jira/valid-reference
|
@stephenfin: This pull request explicitly references no jira issue. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: stephenfin The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
@stephenfin: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
We should probably wait for 4.21 to be GA before we merge this patch |
openshift-ci
bot
added
the
do-not-merge/hold
4 participants
Merge conflicts are due to our preemptive backport at #349, which differed slightly from what eventually landed upstream.