remove patch number in stemcell.MF [#150189735]

Signed-off-by: Natalie Arellano <[email protected]>

Author: davidjahn

lib/stemcell/builder/vsphere.rb

@@ -2,6 +2,7 @@
 require 'tmpdir'
 require 'zlib'
 require 'nokogiri'
+require 'fileutils'
 
 module Stemcell
   class Builder
@@ -101,9 +102,12 @@ def find_file_by_extn(dir, extn)
 
       def run_stembuild
         vmdk_file = find_file_by_extn(@output_directory, "vmdk")
-        cmd = "stembuild -vmdk \"#{vmdk_file}\" -v \"#{@version}\" -output \"#{@output_directory}\""
+        cmd = "stembuild -vmdk \"#{vmdk_file}\" -v \"#{Stemcell::Manifest::Base.strip_version_build_number(@version)}\" -output \"#{@output_directory}\""
         puts "running stembuild command: [[ #{cmd} ]]"
         `#{cmd}`
+        new_filename = "bosh-stemcell-#{@version}-vsphere-esxi-windows2012R2-go_agent.tgz"
+        puts "renaming stemcell to #{new_filename}"
+        FileUtils.mv Dir[File.join(@output_directory, "*.tgz")].first, File.join(@output_directory, new_filename)
       end
 
       def find_vmx_file(dir)

lib/stemcell/manifest.rb

@@ -5,10 +5,19 @@ module Manifest
     EMPTY_FILE_SHA = 'da39a3ee5e6b4b0d3255bfef95601890afd80709'.freeze
 
     class Base
+      def self.strip_version_build_number(version)
+        md = version.match(/(\d+\.\d+)\.(\d+)-build\.(\d+)/)
+        if md
+          return md[1]
+        else
+          return version
+        end
+      end
+
       def initialize(name, version, sha, os)
         @contents = {
           'name' => name,
-          'version' => version,
+          'version' => self.class.strip_version_build_number(version),
           'sha1' => sha,
           'operating_system' => os,
           'cloud_properties' => {}

spec/fixtures/vsphere/stembuild

@@ -3,3 +3,4 @@ require 'fileutils'
 
 OUTPUT_DIR = ARGV[5]
 FileUtils.cp(File.join(__dir__, "bosh-stemcell-5555.5-vsphere-esxi-windows2012R2-go_agent.tgz"), OUTPUT_DIR)
+File.write(File.join(OUTPUT_DIR, "myargs"), ARGV.inspect)

spec/integration/build/aws_spec.rb

@@ -32,7 +32,7 @@
   it 'should build an aws stemcell' do
     Dir.mktmpdir('aws-stemcell-test') do |tmpdir|
       os_version = 'windows2012R2'
-      version = 'some-version'
+      version = '1200.3.1-build.2'
       agent_commit = 'some-agent-commit'
 
       ENV['AWS_ACCESS_KEY'] = aws_access_key = 'some-aws_access_key'
@@ -47,7 +47,7 @@
 
       File.write(
         File.join(@version_dir, 'number'),
-        'some-version'
+        version
       )
 
       FileUtils.mkdir_p(File.join(@build_dir, 'compiled-agent'))
@@ -84,7 +84,7 @@
       stemcell_sha = File.join(@output_directory, "light-bosh-stemcell-#{version}-aws-xen-hvm-#{os_version}-go_agent-#{region}.tgz.sha")
 
       stemcell_manifest = YAML.load(read_from_tgz(stemcell, 'stemcell.MF'))
-      expect(stemcell_manifest['version']).to eq(version)
+      expect(stemcell_manifest['version']).to eq('1200.3')
       expect(stemcell_manifest['sha1']).to eq(EMPTY_FILE_SHA)
       expect(stemcell_manifest['operating_system']).to eq(os_version)
       expect(stemcell_manifest['cloud_properties']['infrastructure']).to eq('aws')

spec/integration/build/azure_spec.rb

@@ -67,7 +67,7 @@
       stemcell_sha = File.join(@output_directory, "light-bosh-stemcell-#{version}-azure-hyperv-#{os_version}-go_agent.tgz.sha")
 
       stemcell_manifest = YAML.load(read_from_tgz(stemcell, 'stemcell.MF'))
-      expect(stemcell_manifest['version']).to eq(version)
+      expect(stemcell_manifest['version']).to eq('1200.0')
       expect(stemcell_manifest['sha1']).to eq(EMPTY_FILE_SHA)
       expect(stemcell_manifest['operating_system']).to eq(os_version)
       expect(stemcell_manifest['cloud_properties']['infrastructure']).to eq('azure')

spec/integration/build/gcp_spec.rb

@@ -30,7 +30,7 @@
   it 'should build a gcp stemcell' do
     Dir.mktmpdir('gcp-stemcell-test') do |tmpdir|
       os_version = 'windows2012R2'
-      version = 'some-version'
+      version = '1200.3.1-build.2'
       agent_commit = 'some-agent-commit'
 
       ENV['ACCOUNT_JSON'] = {'project_id' => 'some-project-id'}.to_json
@@ -41,7 +41,7 @@
 
       File.write(
         File.join(@version_dir, 'number'),
-        'some-version'
+        version
       )
 
       FileUtils.mkdir_p(File.join(@build_dir, 'compiled-agent'))
@@ -59,7 +59,7 @@
       stemcell = File.join(@output_directory, "light-bosh-stemcell-#{version}-google-kvm-#{os_version}-go_agent.tgz")
 
       stemcell_manifest = YAML.load(read_from_tgz(stemcell, 'stemcell.MF'))
-      expect(stemcell_manifest['version']).to eq(version)
+      expect(stemcell_manifest['version']).to eq('1200.3')
       expect(stemcell_manifest['sha1']).to eq(EMPTY_FILE_SHA)
       expect(stemcell_manifest['operating_system']).to eq(os_version)
       expect(stemcell_manifest['cloud_properties']['infrastructure']).to eq('google')

spec/integration/build/vsphere_spec.rb

@@ -47,7 +47,7 @@
 
     File.write(
       File.join(@version_dir, 'number'),
-      'some-vmx-version'
+      'some-version'
     )
 
     s3_vmx= double(:s3_vmx)
@@ -72,7 +72,7 @@
 
   it 'should build a vsphere stemcell' do
     os_version = 'windows2012R2'
-    version = 'some-version'
+    version = '1200.3.1-build.2'
     agent_commit = 'some-agent-commit'
 
     ENV['AWS_ACCESS_KEY_ID']= 'some-key'
@@ -135,7 +135,9 @@
     Rake::Task['build:vsphere'].invoke
     packer_output_vmdk = File.join(@output_directory, 'fake.vmdk')
     expect(packer_output_vmdk).not_to be_nil
-    stemcell = File.join(@output_directory, "bosh-stemcell-#{version}-vsphere-esxi-#{os_version}-go_agent.tgz")
-    expect(stemcell).not_to be_nil
+    stembuild_version_arg = JSON.parse(File.read("#{@output_directory}/myargs"))[3]
+    expect(stembuild_version_arg).to eq('1200.3')
+    stemcell_filename = File.basename(Dir["#{@output_directory}/*.tgz"].first)
+    expect(stemcell_filename).to eq "bosh-stemcell-1200.3.1-build.2-vsphere-esxi-windows2012R2-go_agent.tgz"
   end
 end

spec/stemcell/manifest_spec.rb

@@ -87,12 +87,12 @@
 
   describe 'Azure' do
     describe 'dump' do
-      it 'returns a valid stemcell manifest yaml string' do
+      it 'returns a valid stemcell manifest yaml string with build of version removed' do
         manifest = Stemcell::Manifest::Azure.new('1.0.0-build.1', 'some-os', 'some-publisher',
                                                  'some-offer', 'some-sku').dump
         expect(YAML.load(manifest)).to eq(
           'name' => 'bosh-azure-hyperv-some-os-go_agent',
-          'version' => '1.0.0-build.1',
+          'version' => '1.0',
           'sha1' => 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
           'operating_system' => 'some-os',
           'cloud_properties' => {