Adds 1803 as an OS version.

- Uses same hwVersion as 2016

[#159599345] (https://www.pivotaltracker.com/story/show/159599345)

Signed-off-by: Malini Valliath <mvalliath@pivotal.io>

Author: Gab Satchi

integration/apply_patch_command_test.go

@@ -110,10 +110,36 @@ var _ = Describe("Apply Patch", func() {
 				manifestStruct.OSVersion = ""
 			})
 
-			It("displays an error", func(){
+			It("displays an error", func() {
 				session := helpers.Stembuild("apply-patch", manifestFilename)
 				Eventually(session).Should(Exit(1))
-				Eventually(session.Err).Should(Say("OS version must be either 2012R2 or 2016"))
+				Eventually(session.Err).Should(Say("OS version must be either 2012R2, 2016 or 1803"))
+			})
+		})
+
+		Context("when OS version is 1803", func() {
+			BeforeEach(func() {
+				manifestStruct.OSVersion = "1803"
+				osVersion = "1803"
+				manifestStruct.Version = "1803.0"
+				stemcellFilename = fmt.Sprintf("bosh-stemcell-%s-vsphere-esxi-windows%s-go_agent.tgz", manifestStruct.Version, osVersion)
+			})
+
+			AfterEach(func() {
+				Expect(os.Remove(stemcellFilename)).To(Succeed())
+			})
+
+			It("creates a valid stemcell", func() {
+				session := helpers.Stembuild("apply-patch", manifestFilename)
+				Eventually(session, 5).Should(Exit(0))
+
+				stemcellDir, err := helpers.ExtractGzipArchive(stemcellFilename)
+				Expect(err).NotTo(HaveOccurred())
+				manifestFilepath := filepath.Join(stemcellDir, "stemcell.MF")
+				manifest, err := helpers.ReadFile(manifestFilepath)
+				Expect(err).NotTo(HaveOccurred())
+				expectedName := fmt.Sprintf("name: bosh-vsphere-esxi-windows%s-go_agent", osVersion)
+				Expect(manifest).To(ContainSubstring(expectedName))
 			})
 		})
 

integration/convert_vmdk_command_test.go

@@ -22,18 +22,50 @@ var _ = Describe("Convert VMDK", func() {
 		Context("stembuild when executed", func() {
 			var osVersion string
 			var version string
-			BeforeEach(func() {
+
+			AfterEach(func() {
+				Expect(os.Remove(stemcellFilename)).To(Succeed())
+			})
+
+			It("creates a valid 2012R2 stemcell", func() {
 				osVersion = "2012R2"
 				version = "1200.0"
 				stemcellFilename = fmt.Sprintf("bosh-stemcell-%s-vsphere-esxi-windows%s-go_agent.tgz", version, osVersion)
 				inputVmdk = filepath.Join("..", "testdata", "expected.vmdk")
-			})
 
-			AfterEach(func() {
-				Expect(os.Remove(stemcellFilename)).To(Succeed())
+				session := helpers.Stembuild("-vmdk", inputVmdk, "-v", version, "-os", osVersion)
+				Eventually(session, 5).Should(Exit(0))
+				Eventually(session).Should(Say(`created stemcell: .*\.tgz`))
+				Expect(stemcellFilename).To(BeAnExistingFile())
+
+				stemcellDir, err := helpers.ExtractGzipArchive(stemcellFilename)
+				Expect(err).NotTo(HaveOccurred())
+
+				manifestFilepath := filepath.Join(stemcellDir, "stemcell.MF")
+				manifest, err := helpers.ReadFile(manifestFilepath)
+				Expect(err).NotTo(HaveOccurred())
+
+				expectedOs := fmt.Sprintf("operating_system: windows%s", osVersion)
+				Expect(manifest).To(ContainSubstring(expectedOs))
+
+				expectedName := fmt.Sprintf("name: bosh-vsphere-esxi-windows%s-go_agent", osVersion)
+				Expect(manifest).To(ContainSubstring(expectedName))
+
+				imageFilepath := filepath.Join(stemcellDir, "image")
+				imageDir, err := helpers.ExtractGzipArchive(imageFilepath)
+				Expect(err).NotTo(HaveOccurred())
+
+				actualVmdkFilepath := filepath.Join(imageDir, "image-disk1.vmdk")
+				_, err = ioutil.ReadFile(actualVmdkFilepath)
+				Expect(err).NotTo(HaveOccurred())
 			})
 
-			It("creates a valid stemcell", func() {
+			It("creates a valid 1803 stemcell", func() {
+				osVersion = "1803"
+				version = "1803.0"
+				stemcellFilename = fmt.Sprintf("bosh-stemcell-%s-vsphere-esxi-windows%s-go_agent.tgz", version, osVersion)
+				inputVmdk = filepath.Join("..", "testdata", "expected.vmdk")
+
 				session := helpers.Stembuild("-vmdk", inputVmdk, "-v", version, "-os", osVersion)
 				Eventually(session, 5).Should(Exit(0))
 				Eventually(session).Should(Say(`created stemcell: .*\.tgz`))

main.go

@@ -87,7 +87,7 @@ func Init() {
 	flag.StringVar(&applyPatch.PatchFile, "d", "", "Patch file (shorthand)")
 
 	flag.StringVar(&applyPatch.OSVersion, "os", "",
-		"OS version must be either 2012R2 or 2016")
+		"OS version must be either 2012R2, 2016 or 1803")
 
 	flag.StringVar(&applyPatch.Version, "version", "",
 		"Stemcell version in the form of [DIGITS].[DIGITS] (e.x. 123.01)")
@@ -236,10 +236,10 @@ func ValidateFlags() []error {
 
 	Debugf("validating OS version: %s", applyPatch.OSVersion)
 	switch applyPatch.OSVersion {
-	case "2012R2", "2016":
+	case "2012R2", "2016", "1803":
 		// Ok
 	default:
-		add(fmt.Errorf("OS version must be either 2012R2 or 2016 have: %s", applyPatch.OSVersion))
+		add(fmt.Errorf("OS version must be either 2012R2, 2016 or 1803 have: %s", applyPatch.OSVersion))
 	}
 
 	name := filepath.Join(applyPatch.OutputDir, stemcell.StemcellFilename(applyPatch.Version, applyPatch.OSVersion))

stemcell/stemcell.go

@@ -351,7 +351,7 @@ func (c *Config) CreateImage(vmdk string) error {
 	switch c.BuildOptions.OSVersion {
 	case "2012R2":
 		hwVersion = 9
-	case "2016":
+	case "2016", "1803":
 		hwVersion = 10
 	}