diff --git a/cell/lrp_test.go b/cell/lrp_test.go index bcb5046..3d4a746 100644 --- a/cell/lrp_test.go +++ b/cell/lrp_test.go @@ -537,6 +537,16 @@ var _ = Describe("LRP", func() { }) }) + Context("Extra preloaded rootfs is requested", func() { + BeforeEach(func() { + lrp = helpers.LRPCreateRequestWithRootFS(componentMaker.Addresses(), processGuid, helpers.ExtraPreloadedRootFs) + }) + + It("starts the LRP", func() { + Eventually(helpers.LRPStatePoller(lgr, bbsClient, processGuid, nil)).Should(Equal(models.ActualLRPStateRunning)) + }) + }) + Context("Unsupported preloaded rootfs is requested", func() { BeforeEach(func() { lrp = helpers.LRPCreateRequestWithRootFS(componentMaker.Addresses(), processGuid, helpers.BogusPreloadedRootFS) diff --git a/fixtures/diego-extra-rootfs.tar b/fixtures/diego-extra-rootfs.tar new file mode 100644 index 0000000..a718441 Binary files /dev/null and b/fixtures/diego-extra-rootfs.tar differ diff --git a/helpers/bbs_requests.go b/helpers/bbs_requests.go index 2295172..ba30b6e 100644 --- a/helpers/bbs_requests.go +++ b/helpers/bbs_requests.go @@ -17,6 +17,7 @@ const defaultLogGuid = "logGuid" var defaultPreloadedRootFS = "preloaded:" + world.DefaultStack var SecondaryPreloadedRootFS = "preloaded:" + world.PreloadedStacks[1] +var ExtraPreloadedRootFs = "preloaded:diego-extra-rootfs" const BogusPreloadedRootFS = "preloaded:bogus-rootfs" const dockerRootFS = "docker:///cloudfoundry/diego-docker-app#latest" diff --git a/world/components.go b/world/components.go index 32e60ea..f028434 100644 --- a/world/components.go +++ b/world/components.go @@ -1548,6 +1548,7 @@ func (maker v1ComponentMaker) RepN(n int, modifyConfigFuncs ...func(*repconfig.R ReportInterval: durationjson.Duration(1 * time.Minute), EvacuationPollingInterval: durationjson.Duration(1 * time.Second), EvacuationTimeout: durationjson.Duration(1 * time.Second), + ExtraRootfsDir: filepath.Join("..", "fixtures"), LockTTL: durationjson.Duration(10 * time.Second), LockRetryInterval: durationjson.Duration(1 * time.Second), ServerCertFile: maker.repSSL.ServerCert,