Merge remote-tracking branch 'origin/master' into tls-nats

Update CI scripts used in new concourse.
ibuystuff · Aug 29, 2017 · 5cdd649 · 5cdd649
2 parents 49dd41a + 72eb955
commit 5cdd649
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/ci/tasks/create-vsphere-errand-release-windows.yml b/ci/tasks/create-vsphere-errand-release-windows.yml
@@ -1,7 +1,10 @@
 ---
 platform: linux
 
-image: docker:///bosh/windows
+image_resource:
+  type: docker-image
+  source:
+    repository: bosh/windows
 
 inputs:
 - name: bosh-agent

diff --git a/ci/tasks/test-integration-windows.yml b/ci/tasks/test-integration-windows.yml
@@ -1,7 +1,10 @@
 ---
 platform: linux
 
-image: docker:///bosh/agent
+image_resource:
+  type: docker-image
+  source:
+    repository: bosh/agent
 
 inputs:
 - name: bosh-agent

diff --git a/ci/tasks/test-unit.yml b/ci/tasks/test-unit.yml
@@ -1,7 +1,10 @@
 ---
 platform: linux
 
-image: docker:///bosh/agent
+image_resource:
+  type: docker-image
+  source:
+    repository: bosh/agent
 
 inputs:
 - name: bosh-agent

diff --git a/integration/windows/utils/agent.go b/integration/windows/utils/agent.go
@@ -24,7 +24,7 @@ func BuildAgent() error {
 	if err != nil {
 		return err
 	}
-	gomega.Eventually(session, 20*time.Minute).Should(gexec.Exit(0))
+	gomega.Eventually(session, 40*time.Minute).Should(gexec.Exit(0))
 	return nil
 }
 
@@ -37,7 +37,7 @@ func StartVagrant(provider string) (Agent, error) {
 	if err != nil {
 		return Agent{}, err
 	}
-	gomega.Eventually(session, 20*time.Minute).Should(gexec.Exit(0))
+	gomega.Eventually(session, 40*time.Minute).Should(gexec.Exit(0))
 
 	return Agent{
 		ID: agentID,