[release-3.9] Updating fluentd label and wait to be in a single shell

[openshift-cherrypick-robot]

This is an automated cherry-pick of #8676

/assign ewolinetz

[ewolinetz]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ewolinetz, openshift-cherrypick-robot
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approvers:

Assign the PR to them by writing /assign in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[ewolinetz]

bot, retest this please

[ewolinetz]

/retest

[ewolinetz]

fluentd stuck terminating in logging test -- known flake
Manually merging.

[openshift-ci-robot]

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/gcp	886dbd1	link	/test gcp
ci/openshift-jenkins/logging	886dbd1	link	/test logging
ci/openshift-jenkins/install	886dbd1	link	/test install

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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

[sdodson]

/cherrypick release-3.7

[openshift-cherrypick-robot]

@sdodson: #8688 failed to apply on top of branch "release-3.7":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	roles/openshift_logging_fluentd/tasks/main.yaml
M	roles/openshift_logging_fluentd/templates/fluentd_label.sh.j2
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): roles/openshift_logging_fluentd/templates/fluentd_label.sh.j2 deleted in Updating fluentd label and wait to be in a single shell rather than running a script from /tmp and modified in HEAD. Version HEAD of roles/openshift_logging_fluentd/templates/fluentd_label.sh.j2 left in tree.
Auto-merging roles/openshift_logging_fluentd/tasks/main.yaml
CONFLICT (content): Merge conflict in roles/openshift_logging_fluentd/tasks/main.yaml
Removing roles/openshift_logging_fluentd/tasks/label_and_wait.yaml
Patch failed at 0001 Updating fluentd label and wait to be in a single shell rather than running a script from /tmp

In response to this:

/cherrypick release-3.7

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/test-infra repository.