@@ -27,19 +27,19 @@ var _ = g.Describe("deploymentconfigs", func() {

 	defer g.GinkgoRecover()

 	var (

 		oc                              = exutil.NewCLI("cli-deployment", exutil.KubeConfigPath())

-		deploymentFixture               = exutil.FixturePath("testdata", "test-deployment-test.yaml")

-		simpleDeploymentFixture         = exutil.FixturePath("testdata", "deployment-simple.yaml")

-		customDeploymentFixture         = exutil.FixturePath("testdata", "custom-deployment.yaml")

-		generationFixture               = exutil.FixturePath("testdata", "generation-test.yaml")

-		pausedDeploymentFixture         = exutil.FixturePath("testdata", "paused-deployment.yaml")

-		failedHookFixture               = exutil.FixturePath("testdata", "failing-pre-hook.yaml")

-		brokenDeploymentFixture         = exutil.FixturePath("testdata", "test-deployment-broken.yaml")

-		historyLimitedDeploymentFixture = exutil.FixturePath("testdata", "deployment-history-limit.yaml")

-		minReadySecondsFixture          = exutil.FixturePath("testdata", "deployment-min-ready-seconds.yaml")

-		multipleICTFixture              = exutil.FixturePath("testdata", "deployment-example.yaml")

-		tagImagesFixture                = exutil.FixturePath("testdata", "tag-images-deployment.yaml")

-		readinessFixture                = exutil.FixturePath("testdata", "readiness-test.yaml")

-		envRefDeploymentFixture         = exutil.FixturePath("testdata", "deployment-with-ref-env.yaml")

+		deploymentFixture               = exutil.FixturePath("testdata", "deployments", "test-deployment-test.yaml")

+		simpleDeploymentFixture         = exutil.FixturePath("testdata", "deployments", "deployment-simple.yaml")

+		customDeploymentFixture         = exutil.FixturePath("testdata", "deployments", "custom-deployment.yaml")

+		generationFixture               = exutil.FixturePath("testdata", "deployments", "generation-test.yaml")

+		pausedDeploymentFixture         = exutil.FixturePath("testdata", "deployments", "paused-deployment.yaml")

+		failedHookFixture               = exutil.FixturePath("testdata", "deployments", "failing-pre-hook.yaml")

+		brokenDeploymentFixture         = exutil.FixturePath("testdata", "deployments", "test-deployment-broken.yaml")

+		historyLimitedDeploymentFixture = exutil.FixturePath("testdata", "deployments", "deployment-history-limit.yaml")

+		minReadySecondsFixture          = exutil.FixturePath("testdata", "deployments", "deployment-min-ready-seconds.yaml")

+		multipleICTFixture              = exutil.FixturePath("testdata", "deployments", "deployment-example.yaml")

+		tagImagesFixture                = exutil.FixturePath("testdata", "deployments", "tag-images-deployment.yaml")

+		readinessFixture                = exutil.FixturePath("testdata", "deployments", "readiness-test.yaml")

+		envRefDeploymentFixture         = exutil.FixturePath("testdata", "deployments", "deployment-with-ref-env.yaml")

 	)

 	g.Describe("when run iteratively", func() {

deleted file mode 100644

@@ -1,43 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: custom-deployment

-spec:

-  replicas: 2

-  selector:

-    name: custom-deployment

-  strategy:

-    type: Rolling

-    rollingParams:

-      pre:

-        failurePolicy: Abort

-        execNewPod:

-          containerName: myapp

-          command:

-          - /bin/echo

-          - test pre hook executed

-    customParams:

-      command:

-      - /bin/sh

-      - -c

-      - |

-        set -e

-        openshift-deploy --until=50%

-        echo Halfway

-        openshift-deploy

-        echo Finished

-  template:

-    metadata:

-      labels:

-        name: custom-deployment

-    spec:

-      terminationGracePeriodSeconds: 0

-      containers:

-      - image: "docker.io/centos:centos7"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        command:

-        - /bin/sleep

-        - "100"

-  triggers:

-  - type: ConfigChange

deleted file mode 100644

@@ -1,65 +0,0 @@

-apiVersion: v1

-items:

-- apiVersion: v1

-  kind: DeploymentConfig

-  metadata:

-    labels:

-      app: example

-    name: example

-  spec:

-    replicas: 1

-    template:

-      metadata:

-        labels:

-          app: example

-      spec:

-        containers:

-        - imagePullPolicy: Always

-          name: ruby

-          command:

-          - /bin/sleep

-          - "100"

-          ports:

-          - containerPort: 8080

-            protocol: TCP

-          resources: {}

-          terminationMessagePath: /dev/termination-log

-        - imagePullPolicy: Always

-          name: mongodb

-          command:

-          - /bin/sleep

-          - "100"

-          ports:

-          - containerPort: 5000

-            protocol: TCP

-          resources: {}

-          terminationMessagePath: /dev/termination-log

-        dnsPolicy: ClusterFirst

-        restartPolicy: Always

-        securityContext: {}

-        terminationGracePeriodSeconds: 30

-    test: false

-    triggers:

-    - type: ConfigChange

-    - imageChangeParams:

-        automatic: true

-        containerNames:

-        - ruby

-        from:

-          kind: ImageStreamTag

-          name: ruby:latest

-          namespace: openshift

-      type: ImageChange

-    - imageChangeParams:

-        automatic: true

-        containerNames:

-        - mongodb

-        from:

-          kind: ImageStreamTag

-          name: mongodb:latest

-          namespace: openshift

-      type: ImageChange

-  status:

-    observedGeneration: 1

-kind: List

-metadata: {}

deleted file mode 100644

@@ -1,33 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: history-limit

-spec:

-  replicas: 1

-  selector:

-    name: history-limit

-  strategy:

-    type: Rolling

-    rollingParams:

-      pre:

-        failurePolicy: Abort

-        execNewPod:

-          containerName: myapp

-          command:

-          - /bin/echo

-          - test pre hook executed

-  template:

-    metadata:

-      labels:

-        name: history-limit

-    spec:

-      containers:

-      - image: "docker.io/centos:centos7"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        command:

-        - /bin/sleep

-        - "100"

-  triggers:

-  - type: ConfigChange

-  revisionHistoryLimit: 3

deleted file mode 100644

@@ -1,22 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: minreadytest

-spec:

-  replicas: 2

-  minReadySeconds: 500

-  selector:

-    name: minreadytest

-  template:

-    metadata:

-      labels:

-        name: minreadytest

-    spec:

-      terminationGracePeriodSeconds: 0

-      containers:

-      - image: "docker.io/centos:centos7"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        command:

-        - /bin/sleep

-        - "10000"

deleted file mode 100644

@@ -1,35 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: deployment-simple

-spec:

-  replicas: 2

-  selector:

-    name: deployment-simple

-  strategy:

-    type: Rolling

-    rollingParams:

-      #TODO: add a hook for testing

-      #pre:

-      #  failurePolicy: Abort

-      #  execNewPod:

-      #    containerName: myapp

-      #    command:

-      #    - /bin/echo

-      #    - test pre hook executed

-  template:

-    metadata:

-      labels:

-        name: deployment-simple

-    spec:

-      containers:

-      - image: "docker.io/openshift/deployment-example:v1"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        readinessProbe:

-          httpGet:

-            path: /

-            port: 8080

-            scheme: HTTP

-  triggers:

-  - type: ConfigChange

deleted file mode 100644

@@ -1,33 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: deployment-simple

-spec:

-  triggers: []

-  replicas: 1

-  selector:

-    name: deployment-simple

-  strategy:

-    type: Rolling

-    rollingParams:

-      pre:

-        failurePolicy: Abort

-        execNewPod:

-          containerName: myapp

-          env:

-            - name: HELLO

-              valueFrom:

-                configMapKeyRef:

-                  name: test

-                  key: foo

-          command: ["/bin/bash", "-c", "echo hello ${HELLO}"]

-  template:

-    metadata:

-      labels:

-        name: deployment-simple

-    spec:

-      containers:

-      - image: "openshift/origin-base:latest"

-        args: [ "sleep 120" ]

-        imagePullPolicy: IfNotPresent

-        name: myapp

new file mode 100644

@@ -0,0 +1,43 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: custom-deployment

+spec:

+  replicas: 2

+  selector:

+    name: custom-deployment

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/echo

+          - test pre hook executed

+    customParams:

+      command:

+      - /bin/sh

+      - -c

+      - |

+        set -e

+        openshift-deploy --until=50%

+        echo Halfway

+        openshift-deploy

+        echo Finished

+  template:

+    metadata:

+      labels:

+        name: custom-deployment

+    spec:

+      terminationGracePeriodSeconds: 0

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

+  triggers:

+  - type: ConfigChange

new file mode 100644

@@ -0,0 +1,65 @@

+apiVersion: v1

+items:

+- apiVersion: v1

+  kind: DeploymentConfig

+  metadata:

+    labels:

+      app: example

+    name: example

+  spec:

+    replicas: 1

+    template:

+      metadata:

+        labels:

+          app: example

+      spec:

+        containers:

+        - imagePullPolicy: Always

+          name: ruby

+          command:

+          - /bin/sleep

+          - "100"

+          ports:

+          - containerPort: 8080

+            protocol: TCP

+          resources: {}

+          terminationMessagePath: /dev/termination-log

+        - imagePullPolicy: Always

+          name: mongodb

+          command:

+          - /bin/sleep

+          - "100"

+          ports:

+          - containerPort: 5000

+            protocol: TCP

+          resources: {}

+          terminationMessagePath: /dev/termination-log

+        dnsPolicy: ClusterFirst

+        restartPolicy: Always

+        securityContext: {}

+        terminationGracePeriodSeconds: 30

+    test: false

+    triggers:

+    - type: ConfigChange

+    - imageChangeParams:

+        automatic: true

+        containerNames:

+        - ruby

+        from:

+          kind: ImageStreamTag

+          name: ruby:latest

+          namespace: openshift

+      type: ImageChange

+    - imageChangeParams:

+        automatic: true

+        containerNames:

+        - mongodb

+        from:

+          kind: ImageStreamTag

+          name: mongodb:latest

+          namespace: openshift

+      type: ImageChange

+  status:

+    observedGeneration: 1

+kind: List

+metadata: {}

new file mode 100644

@@ -0,0 +1,33 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: history-limit

+spec:

+  replicas: 1

+  selector:

+    name: history-limit

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/echo

+          - test pre hook executed

+  template:

+    metadata:

+      labels:

+        name: history-limit

+    spec:

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

+  triggers:

+  - type: ConfigChange

+  revisionHistoryLimit: 3

new file mode 100644

@@ -0,0 +1,22 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: minreadytest

+spec:

+  replicas: 2

+  minReadySeconds: 500

+  selector:

+    name: minreadytest

+  template:

+    metadata:

+      labels:

+        name: minreadytest

+    spec:

+      terminationGracePeriodSeconds: 0

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "10000"

new file mode 100644

@@ -0,0 +1,35 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: deployment-simple

+spec:

+  replicas: 2

+  selector:

+    name: deployment-simple

+  strategy:

+    type: Rolling

+    rollingParams:

+      #TODO: add a hook for testing

+      #pre:

+      #  failurePolicy: Abort

+      #  execNewPod:

+      #    containerName: myapp

+      #    command:

+      #    - /bin/echo

+      #    - test pre hook executed

+  template:

+    metadata:

+      labels:

+        name: deployment-simple

+    spec:

+      containers:

+      - image: "docker.io/openshift/deployment-example:v1"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        readinessProbe:

+          httpGet:

+            path: /

+            port: 8080

+            scheme: HTTP

+  triggers:

+  - type: ConfigChange

new file mode 100644

@@ -0,0 +1,33 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: deployment-simple

+spec:

+  triggers: []

+  replicas: 1

+  selector:

+    name: deployment-simple

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          env:

+            - name: HELLO

+              valueFrom:

+                configMapKeyRef:

+                  name: test

+                  key: foo

+          command: ["/bin/bash", "-c", "echo hello ${HELLO}"]

+  template:

+    metadata:

+      labels:

+        name: deployment-simple

+    spec:

+      containers:

+      - image: "openshift/origin-base:latest"

+        args: [ "sleep 120" ]

+        imagePullPolicy: IfNotPresent

+        name: myapp

new file mode 100644

@@ -0,0 +1,27 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: hook

+spec:

+  replicas: 1

+  selector:

+    name: hook

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Retry

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/echo `date`; /bin/true

+  template:

+    metadata:

+      labels:

+        name: hook

+    spec:

+      containers:

+      - image: "docker.io/openshift/deployment-example:v1"

+        name: myapp

+  triggers:

+  - type: ConfigChange

new file mode 100644

@@ -0,0 +1,32 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: generation-test

+spec:

+  replicas: 1

+  selector:

+    name: generation-test

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/echo

+          - test pre hook executed

+  template:

+    metadata:

+      labels:

+        name: generation-test

+    spec:

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

+  triggers:

+  - type: ConfigChange

new file mode 100644

@@ -0,0 +1,19 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: paused

+spec:

+  paused: true

+  replicas: 1

+  template:

+    metadata:

+      labels:

+        name: paused

+    spec:

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

new file mode 100644

@@ -0,0 +1,27 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: readiness

+spec:

+  replicas: 1

+  strategy:

+    rollingParams:

+      timeoutSeconds: 30

+    type: Rolling

+  template:

+    metadata:

+      labels:

+        name: readiness-test

+    spec:

+      containers:

+      - command:

+        - /bin/sleep

+        - "10000"

+        image: docker.io/centos:centos7

+        imagePullPolicy: IfNotPresent

+        name: never-ready

+        readinessProbe:

+          exec:

+            command:

+            - /bin/false

+          failureThreshold: 1

new file mode 100644

@@ -0,0 +1,36 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: tag-images

+spec:

+  replicas: 1

+  test: true

+  selector:

+    name: tag-images

+  strategy:

+    type: Recreate

+    recreateParams:

+      timeoutSeconds: 600

+      post:

+        failurePolicy: Abort

+        tagImages:

+        - containerName: sample-name

+          to:

+            kind: ImageStreamTag

+            name: sample-stream:deployed

+  template:

+    metadata:

+      labels:

+        name: tag-images

+    spec:

+      containers:

+      - image: openshift/origin-pod

+        imagePullPolicy: IfNotPresent

+        name: sample-name

+        ports:

+        - containerPort: 8080

+          protocol: TCP

+        resources:

+          limits:

+            cpu: 100m

+            memory: 3Gi

new file mode 100644

@@ -0,0 +1,31 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: brokendeployment

+spec:

+  replicas: 1

+  selector:

+    name: brokendeployment

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/false

+  template:

+    metadata:

+      labels:

+        name: brokendeployment

+    spec:

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

+  triggers:

+  - type: ConfigChange

new file mode 100644

@@ -0,0 +1,34 @@

+apiVersion: v1

+kind: DeploymentConfig

+metadata:

+  name: deployment-test

+spec:

+  replicas: 2

+  selector:

+    name: deployment-test

+  strategy:

+    type: Rolling

+    rollingParams:

+      pre:

+        failurePolicy: Abort

+        execNewPod:

+          containerName: myapp

+          command:

+          - /bin/echo

+          - test pre hook executed

+  template:

+    metadata:

+      labels:

+        name: deployment-test

+    spec:

+      terminationGracePeriodSeconds: 0

+      containers:

+      - image: "docker.io/centos:centos7"

+        imagePullPolicy: IfNotPresent

+        name: myapp

+        command:

+        - /bin/sleep

+        - "100"

+  test: true

+  triggers:

+  - type: ConfigChange

deleted file mode 100644

@@ -1,27 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: hook

-spec:

-  replicas: 1

-  selector:

-    name: hook

-  strategy:

-    type: Rolling

-    rollingParams:

-      pre:

-        failurePolicy: Retry

-        execNewPod:

-          containerName: myapp

-          command:

-          - /bin/echo `date`; /bin/true

-  template:

-    metadata:

-      labels:

-        name: hook

-    spec:

-      containers:

-      - image: "docker.io/openshift/deployment-example:v1"

-        name: myapp

-  triggers:

-  - type: ConfigChange

deleted file mode 100644

@@ -1,32 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: generation-test

-spec:

-  replicas: 1

-  selector:

-    name: generation-test

-  strategy:

-    type: Rolling

-    rollingParams:

-      pre:

-        failurePolicy: Abort

-        execNewPod:

-          containerName: myapp

-          command:

-          - /bin/echo

-          - test pre hook executed

-  template:

-    metadata:

-      labels:

-        name: generation-test

-    spec:

-      containers:

-      - image: "docker.io/centos:centos7"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        command:

-        - /bin/sleep

-        - "100"

-  triggers:

-  - type: ConfigChange

deleted file mode 100644

@@ -1,19 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: paused

-spec:

-  paused: true

-  replicas: 1

-  template:

-    metadata:

-      labels:

-        name: paused

-    spec:

-      containers:

-      - image: "docker.io/centos:centos7"

-        imagePullPolicy: IfNotPresent

-        name: myapp

-        command:

-        - /bin/sleep

-        - "100"

deleted file mode 100644

@@ -1,27 +0,0 @@

-apiVersion: v1

-kind: DeploymentConfig

-metadata:

-  name: readiness

-spec:

-  replicas: 1

-  strategy:

-    rollingParams:

-      timeoutSeconds: 30

-    type: Rolling

-  template:

-    metadata:

-      labels:

-        name: readiness-test

-    spec:

-      containers:

-      - command:

-        - /bin/sleep

-        - "10000"

-        image: docker.io/centos:centos7

-        imagePullPolicy: IfNotPresent