Ensure the test deployment invariant is maintained

[smarterclayton]

Update scale for deployment while also setting next phase.

Fixes #9195 [test]

[0xmichalis]

This is getting annoying. Can't we just add a test annotation in the deployment when it's created? Then you wouldn't need to deserialize at all... and it's all over the place in this controller.

[smarterclayton]

Denormalizing the data into more annotations is not the right thing to be doing. We serialize the config for a reason.

[smarterclayton]

Comment addressed, [merge]

[0xmichalis]

Back to the first one

• Failure [20.435 seconds]
deploymentconfigs
/data/src/github.com/openshift/origin/test/extended/deployments/deployments.go:554
  with test deployments
  /data/src/github.com/openshift/origin/test/extended/deployments/deployments.go:255
    should run a deployment to completion and then scale to zero [Conformance] [It]
    /data/src/github.com/openshift/origin/test/extended/deployments/deployments.go:254

    Expected
        <string>: --> pre: Running hook pod ...
        test pre hook executed
        --> pre: Success
        --> Scaling deployment-test-1 to 2
        --> Waiting up to 10m0s for pods in deployment deployment-test-1 to become ready
    to contain substring
        <string>: --> Success

    /data/src/github.com/openshift/origin/test/extended/deployments/deployments.go:211
------------------------------

We may want to use the failure trap for this test.

[smarterclayton]

Extended.deploymentconfigs with test deployments should run a deployment to completion and then scale to zero [Conformance] (from (conformance_parallel_01.xml))

/data/src/github.com/openshift/origin/test/extended/deployments/deployments.go:254
Expected
    <string>: --> pre: Running hook pod ...
    test pre hook executed
    --> pre: Success
    --> Scaling deployment-test-1 to 2
    --> Waiting up to 10m0s for pods in deployment deployment-test-1 to become ready
to contain substring
    <string>: --> Success

I think this is #9775

[smarterclayton]

[test]

[openshift-bot]

Evaluated for origin test up to 74a5893

[openshift-bot]

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

[smarterclayton]

[merge] and will switch to failure trap later

[openshift-bot]

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6293/) (Image: devenv-rhel7_4594)

[openshift-bot]

Evaluated for origin merge up to 74a5893