Remove doozer env vars from ci-openshift golang images

[joepvd]

No description provided.

[openshift-bot]

Validating 12 file(s)...
Traceback (most recent call last):
File "/usr/local/bin/validate-ocp-build-data", line 33, in
sys.exit(load_entry_point('rh-ocp-build-data-validator==0.2.5', 'console_scripts', 'validate-ocp-build-data')())
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 87, in main
validate(f, args.exclude_vpn, args.schema_only)
File "/usr/local/lib/python3.9/site-packages/validator/main.py", line 14, in validate
support.fail_validation(msg, parsed)
File "/usr/local/lib/python3.9/site-packages/validator/support.py", line 11, in fail_validation
raise exceptions.ValidationFailed(msg)
validator.exceptions.ValidationFailed: ci_images/rhel-8/ci-openshift-build-root/Dockerfile is not a valid YAML
Returned error: did not find expected
in "", line 5, column 1

[locriandev]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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

[joepvd]

/cherrypick openshift-4.18

[openshift-cherrypick-robot]

@joepvd: #5758 failed to apply on top of branch "openshift-4.18":

Applying: Remove doozer env vars from ci-openshift golang images
Using index info to reconstruct a base tree...
M	ci_images/rhel-8/ci-openshift-build-root/Dockerfile
M	ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
M	ci_images/rhel-9/ci-openshift-build-root/Dockerfile
M	ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
M	images/ci-openshift-build-root-latest.rhel8.yml
M	images/ci-openshift-build-root-latest.rhel9.yml
A	images/ci-openshift-build-root-previous.rhel8.yml
A	images/ci-openshift-build-root-previous.rhel9.yml
M	images/ci-openshift-golang-builder-latest.rhel8.yml
M	images/ci-openshift-golang-builder-latest.rhel9.yml
A	images/ci-openshift-golang-builder-previous.rhel8.yml
A	images/ci-openshift-golang-builder-previous.rhel9.yml
Falling back to patching base and 3-way merge...
Auto-merging images/ci-openshift-golang-builder-previous.rhel9.disabled
CONFLICT (content): Merge conflict in images/ci-openshift-golang-builder-previous.rhel9.disabled
Auto-merging images/ci-openshift-golang-builder-previous.rhel8.disabled
CONFLICT (content): Merge conflict in images/ci-openshift-golang-builder-previous.rhel8.disabled
Auto-merging images/ci-openshift-golang-builder-latest.rhel9.yml
CONFLICT (content): Merge conflict in images/ci-openshift-golang-builder-latest.rhel9.yml
Auto-merging images/ci-openshift-golang-builder-latest.rhel8.yml
CONFLICT (content): Merge conflict in images/ci-openshift-golang-builder-latest.rhel8.yml
Auto-merging images/ci-openshift-build-root-previous.rhel9.disabled
CONFLICT (content): Merge conflict in images/ci-openshift-build-root-previous.rhel9.disabled
Auto-merging images/ci-openshift-build-root-previous.rhel8.disabled
CONFLICT (content): Merge conflict in images/ci-openshift-build-root-previous.rhel8.disabled
Auto-merging images/ci-openshift-build-root-latest.rhel9.yml
CONFLICT (content): Merge conflict in images/ci-openshift-build-root-latest.rhel9.yml
Auto-merging images/ci-openshift-build-root-latest.rhel8.yml
CONFLICT (content): Merge conflict in images/ci-openshift-build-root-latest.rhel8.yml
Auto-merging ci_images/rhel-9/ci-openshift-golang-builder/Dockerfile
Auto-merging ci_images/rhel-9/ci-openshift-build-root/Dockerfile
Auto-merging ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
CONFLICT (content): Merge conflict in ci_images/rhel-8/ci-openshift-golang-builder/Dockerfile
Auto-merging ci_images/rhel-8/ci-openshift-build-root/Dockerfile
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 advice.mergeConflict false"
Patch failed at 0001 Remove doozer env vars from ci-openshift golang images

In response to this:

/cherrypick openshift-4.18

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.