Make sure config smoke test has all three options

Signed-off-by: Keaty Gross <kgross@pivotal.io>
Signed-off-by: Dave Goddard <dave@goddard.id.au>

pipelines/integration.yml

@@ -118,8 +118,9 @@ groups:
       - caching-redis-net451-windows
   - name: config
     jobs:
-      - config-netcore-windows
-      - config-netcore-linux
+      - config-windows
+      - config-linux
+      - config-net451
   - name: security
     jobs:
       - security-linux
@@ -746,7 +747,7 @@ jobs:
       task: delete-space
       file: steeltoe-ci/tasks/delete-space.yml
 
-- name: config-netcore-windows
+- name: config-windows
   plan:
   - get: steeltoe-ci
   - get: connectors
@@ -766,7 +767,7 @@ jobs:
       params:
         SOURCE_DIR: samples/Configuration/src/AspDotNetCore/SimpleCloudFoundry
         MANIFEST_YAML: manifest-windows.yml
-        FRAMEWORK: net451
+        FRAMEWORK: netcoreapp1.0
         RUNTIME: win7-x64
     - task: push-app
       attempts: 2
@@ -784,7 +785,7 @@ jobs:
       task: delete-space
       file: steeltoe-ci/tasks/delete-space.yml
 
-- name: config-netcore-linux
+- name: config-linux
   plan:
   - get: steeltoe-ci
   - get: connectors
@@ -822,6 +823,44 @@ jobs:
       task: delete-space
       file: steeltoe-ci/tasks/delete-space.yml
 
+- name: config-net451
+  plan:
+  - get: steeltoe-ci
+  - get: connectors
+    trigger: false
+  - get: samples
+    resource: samples-config
+    trigger: false
+  - put: cf-space
+    resource: pcfdev-space
+  - do:
+    - task: create-service
+      file: steeltoe-ci/tasks/create-service.yml
+      params:
+        CREATE_SERVICE: p-config-server standard myConfigServer -c ./samples/Configuration/src/AspDotNetCore/SimpleCloudFoundry/config-server.json
+    - task: publish
+      file: steeltoe-ci/tasks/publish.yml
+      params:
+        SOURCE_DIR: samples/Configuration/src/AspDotNetCore/SimpleCloudFoundry
+        MANIFEST_YAML: manifest-windows.yml
+        FRAMEWORK: net451
+        RUNTIME: win7-x64
+    - task: push-app
+      attempts: 2
+      file: steeltoe-ci/tasks/push-app.yml
+      params:
+        STACK: windows2012R2
+        APPNAME: foo
+    - task: test-app
+      attempts: 5
+      file: steeltoe-ci/tasks/test-app.yml
+      params:
+        URL_PATH: /Home/ConfigServer
+        TEXT: <h4>Property info.description=Spring Cloud Samples
+    ensure:
+      task: delete-space
+      file: steeltoe-ci/tasks/delete-space.yml
+
 - name: security-linux
   plan:
   - get: steeltoe-ci

tasks/create-service.yml

@@ -20,3 +20,11 @@ run:
     if [ ! -z "$CREATE_CUPS" ]; then
       cf cups $(echo $CREATE_CUPS | sed "s/\${SPACE}/$SPACE/g")
     fi
+
+    set +x
+    while [ `cf services | grep 'in progress' | wc -l | sed 's/ //g'` != 0 ]; do
+      echo 'Waiting for services to start'
+      cf services | grep 'in progress'
+      echo
+      sleep 5
+    done