UPSTREAM: <drop>: fixup for 14537

[markturansky]

Conflicts and rejected patch files means I missed a few things in the origin patch PR.

This PR cleans up a few issues and fixes one bug.

@deads2k @pweil-

[deads2k]

[test]

[markturansky]

Unrelated flake?

Error from server: 501: All the given peers are not reachable (failed to propose on members [https://172.18.15.99:4001] twice [last error: Unexpected HTTP status code]) [0]
!!! Error in hack/../test/end-to-end/core.sh:164
    'oc delete pod cli-with-token-2' exited with status 1
Call stack:
    1: hack/../test/end-to-end/core.sh:164 main(...)
Exiting with status 1
Error from server: User "e2e-user" cannot list all buildconfigs in the cluster

[pweil-]

re[test]

[markturansky]

Different flake:

Error from server: User "system:anonymous" cannot list pods in project "default"
Dry run enabled - no modifications will be made. Add --confirm to remove images
!!! Error in hack/../test/cmd/../../hack/cmd_util.sh:407
    'return 1' exited with status 1
Call stack:
    1: hack/../test/cmd/../../hack/cmd_util.sh:407 os::cmd::try_until_success(...)
    2: hack/../test/cmd/newapp.sh:20 main(...)
Exiting with status 1
!!! Error in hack/test-cmd.sh:284
    '${test}' exited with status 1
Call stack:
    1: hack/test-cmd.sh:284 main(...)
Exiting with status 1
make: *** [test-int-plus] Error 1

[markturansky]

[test]

[ncdc]

@markturansky FYI that wasn't the flake. The flake was #6259 (comment), which we're trying to fix with #6407

[markturansky]

Thanks for the clarification.

[ncdc]

Latest failure:

Running hack/../test/cmd/builds.sh:79: executing 'oc patch bc/ruby-sample-build -p '{"spec":{"output":{"to":{"name":"different:tag1"}}}}'' expecting success...
FAILURE after 0.279s: hack/../test/cmd/builds.sh:79: executing 'oc patch bc/ruby-sample-build -p '{"spec":{"output":{"to":{"name":"different:tag1"}}}}'' expecting success: the command returned the wrong error code
There was no output from the command.
Standard error from the command:
Error from server: unable to find api field in struct BuildConfig for the json field "metadata"
!!! Error in hack/../test/cmd/../../hack/cmd_util.sh:193
    'return 1' exited with status 1
Call stack:
    1: hack/../test/cmd/../../hack/cmd_util.sh:193 os::cmd::expect_success(...)
    2: hack/../test/cmd/builds.sh:79 main(...)
Exiting with status 1
!!! Error in hack/test-cmd.sh:284
    '${test}' exited with status 1
Call stack:
    1: hack/test-cmd.sh:284 main(...)
Exiting with status 1
[FAIL] !!!!! Test Failed !!!!

[test]

[ncdc]

❄️ ⛄

Error from server: 501: All the given peers are not reachable (failed to propose on members [https://172.18.3.40:4001] twice [last error: Unexpected HTTP status code]) [0]
!!! Error in hack/../test/end-to-end/core.sh:164
    'oc delete pod cli-with-token-2' exited with status 1
Call stack:
    1: hack/../test/end-to-end/core.sh:164 main(...)
Exiting with status 1

[FAIL] !!!!! Test Failed !!!!

[test]

[openshift-bot]

Evaluated for origin test up to 078ce03

[openshift-bot]

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7995/)

[markturansky]

woot! all green!

[danmcp]

@ncdc I think you asked me about it earlier. It isn't tagged for merge though.

[smarterclayton]

Going to merge so it makes a build afterwards but I want to see a LGTM and sign off from the upstream reviewer. [merge]

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7995/) (Image: devenv-rhel7_2994)

[openshift-bot]

Evaluated for origin merge up to 078ce03

[liggitt]

shouldn't this be a return? you go on to use newClaim anyway, which seems wrong