Update to windows1803fs-release

We also want to start moving towards being agnostic of the version. We started doing this by making the "embed" folder not have the version inside of it, so instead of updating `/embed/windows2016fs-release` to `/embed/windows1803fs-release`, we are always embedding the release at `/embed/windowsfs-release`. There are still dependencies on the version, but we want to address these incrementally [#159601804] [XTP] Garden-windows team wants PASW 2016 2.3 Updates Signed-off-by: Chris Hendrix <[email protected]>
pivotal-cf · Aug 8, 2018 · b855086 · b855086
1 parent 677eb06
commit b855086
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/winfsinjector/application.go b/winfsinjector/application.go
@@ -64,7 +64,7 @@ func (a Application) Run(inputTile, outputTile, workingDir string) error {
  return err
  }
 
- releaseDir := filepath.Join(extractedTileDir, "embed", "windows2016fs-release")
+ releaseDir := filepath.Join(extractedTileDir, "embed", "windowsfs-release")
  releaseVersion, err := a.extractReleaseVersion(releaseDir)
  if err != nil {
  return err
@@ -86,9 +86,10 @@ func (a Application) Run(inputTile, outputTile, workingDir string) error {
  }
  }
 
- releaseName := "windows2016fs"
+ // Dependent on what the tile metadata expects, p-windows-runtime-2016/jobs/windows1803fs.yml
+ releaseName := "windows1803fs"
  imageName := "cloudfoundry/windows2016fs"
- imageTagPath := filepath.Join(releaseDir, "src", "code.cloudfoundry.org", "windows2016fs", "1709", "IMAGE_TAG")
+ imageTagPath := filepath.Join(releaseDir, "src", "code.cloudfoundry.org", "windows2016fs", "1803", "IMAGE_TAG")
  tarballPath := filepath.Join(extractedTileDir, "releases", fmt.Sprintf("%s-%s.tgz", releaseName, releaseVersion))
 
  err = a.releaseCreator.CreateRelease(imageName, releaseDir, tarballPath, imageTagPath, filepath.Join(releaseDir, "VERSION"))
@@ -101,7 +102,7 @@ func (a Application) Run(inputTile, outputTile, workingDir string) error {
  return err
  }
 
- err = removeAll(filepath.Join(extractedTileDir, "embed", "windows2016fs-release"))
+ err = removeAll(filepath.Join(extractedTileDir, "embed", "windowsfs-release"))
  if err != nil {
  return err
  }

diff --git a/winfsinjector/application_test.go b/winfsinjector/application_test.go
@@ -55,10 +55,10 @@ var _ = Describe("application", func() {
  Expect(fakeReleaseCreator.CreateReleaseCallCount()).To(Equal(1))
  imageName, releaseDir, tarballPath, imageTagPath, versionDataPath := fakeReleaseCreator.CreateReleaseArgsForCall(0)
  Expect(imageName).To(Equal("cloudfoundry/windows2016fs"))
- Expect(releaseDir).To(Equal("/path/to/working/dir/extracted-tile/embed/windows2016fs-release"))
- Expect(tarballPath).To(Equal("/path/to/working/dir/extracted-tile/releases/windows2016fs-9.3.6.tgz"))
- Expect(imageTagPath).To(Equal("/path/to/working/dir/extracted-tile/embed/windows2016fs-release/src/code.cloudfoundry.org/windows2016fs/1709/IMAGE_TAG"))
- Expect(versionDataPath).To(Equal("/path/to/working/dir/extracted-tile/embed/windows2016fs-release/VERSION"))
+ Expect(releaseDir).To(Equal("/path/to/working/dir/extracted-tile/embed/windowsfs-release"))
+ Expect(tarballPath).To(Equal("/path/to/working/dir/extracted-tile/releases/windows1803fs-9.3.6.tgz"))
+ Expect(imageTagPath).To(Equal("/path/to/working/dir/extracted-tile/embed/windowsfs-release/src/code.cloudfoundry.org/windows2016fs/1803/IMAGE_TAG"))
+ Expect(versionDataPath).To(Equal("/path/to/working/dir/extracted-tile/embed/windowsfs-release/VERSION"))
  })
 
  It("injects the build windows release into the extracted tile", func() {
@@ -70,8 +70,8 @@ var _ = Describe("application", func() {
 
  Expect(fakeInjector.AddReleaseToMetadataCallCount()).To(Equal(1))
  releasePath, releaseName, releaseVersion, tileDir := fakeInjector.AddReleaseToMetadataArgsForCall(0)
- Expect(releasePath).To(Equal("/path/to/working/dir/extracted-tile/releases/windows2016fs-9.3.6.tgz"))
- Expect(releaseName).To(Equal("windows2016fs"))
+ Expect(releasePath).To(Equal("/path/to/working/dir/extracted-tile/releases/windows1803fs-9.3.6.tgz"))
+ Expect(releaseName).To(Equal("windows1803fs"))
  Expect(releaseVersion).To(Equal("9.3.6"))
  Expect(tileDir).To(Equal(filepath.Join("/path/to/working/dir", "extracted-tile")))
  })
@@ -92,7 +92,7 @@ var _ = Describe("application", func() {
  Expect(err).NotTo(HaveOccurred())
 
  Expect(removeAllCallCount).To(Equal(1))
- Expect(removeAllPath).To(Equal(filepath.Join("/", "path", "to", "working", "dir", "extracted-tile", "embed", "windows2016fs-release")))
+ Expect(removeAllPath).To(Equal(filepath.Join("/", "path", "to", "working", "dir", "extracted-tile", "embed", "windowsfs-release")))
  })
 
  It("zips up the injected tile dir", func() {