Remove pre-2019 references and code

Only Windows 2019 is supported.

Introduce `SPEC_ROOT` and `REPO_ROOT` replacing relative path
traversals.

Author: aramprice

lib/packer/config/aws.rb

@@ -18,19 +18,14 @@ def initialize(aws_access_key:, aws_secret_key:, aws_role_arn: nil, region:, os:
       def builders
         stemcell_builder_dir = File.expand_path('../../../../', __FILE__)
         packer_ci_private_key_location = ENV.fetch('PACKER_CI_PRIVATE_KEY_LOCATION', '../packer-ci-private-key/key')
-        #TODO deleteme. Added to resolve a winrm with newer source ami (ami-0060daada4a15ad8a)
-        source_ami = @region[:base_ami]
-        if @os == 'windows2012R2'
-          source_ami = "ami-067ff23da8261d1c7"
-        end
         [
           {
             name: "amazon-ebs-#{@region[:name]}",
             type: 'amazon-ebs',
             access_key: @aws_access_key,
             secret_key: @aws_secret_key,
             region: @region[:name],
-            source_ami: source_ami,
+            source_ami:  @region[:base_ami],
             instance_type: instance_type,
             ami_name: "BOSH-#{SecureRandom.uuid}-#{@region[:name]}",
             vpc_id: @region[:vpc_id],
@@ -69,23 +64,14 @@ def assume_role_parameters
       end
 
       def instance_type
-        type = 'm4.large'
-
-        if @os == 'windows2012R2'
-          type = 'm4.xlarge'
-        end
-
-        type
+        'm4.large'
       end
 
       def launch_block_device_mappings
-        volume_size = 30
-        volume_size = 128 if @os == 'windows2012R2'
-
         [
             {
                 'device_name': '/dev/sda1',
-                'volume_size': volume_size,
+                'volume_size': 30,
                 'volume_type': 'gp2',
                 'delete_on_termination': true,
             }

lib/packer/config/azure.rb

@@ -40,7 +40,7 @@ def builders
                 'location' => @location,
                 'vm_size' => @vm_size,
                 'os_type' => 'Windows',
-                'os_disk_size_gb' => os_disk_size_gb,
+                'os_disk_size_gb' => 30,
                 'communicator' => 'winrm',
                 'winrm_use_ssl' => 'true',
                 'winrm_insecure' => 'true',
@@ -60,16 +60,6 @@ def dump
             'provisioners' => provisioners
         )
       end
-
-      private
-
-      def os_disk_size_gb
-        if @os == 'windows2012R2'
-          128
-        else
-          30
-        end
-      end
     end
   end
 end

lib/packer/config/gcp.rb

@@ -25,7 +25,7 @@ def builders
                 'source_image' => @source_image,
                 'image_family' => @image_family,
                 'zone' => 'us-east1-c',
-                'disk_size' => disk_size,
+                'disk_size' => 32,
                 'image_name' => "packer-#{Time.now.to_i}",
                 'machine_type' => 'n1-standard-4',
                 'omit_external_ip' => false,
@@ -52,16 +52,6 @@ def dump
             'provisioners' => provisioners
         )
       end
-
-      private
-
-      def disk_size
-        if @os == 'windows2012R2'
-          100
-        else
-          32
-        end
-      end
     end
   end
 end

lib/tasks/build/azure.rake

@@ -4,11 +4,14 @@ require 'json'
 namespace :build do
   desc 'Build Azure Stemcell'
   task :azure do
-    build_root = File.expand_path('../../../../build', __FILE__)
+    base_dir_location = ENV.fetch('BUILD_BASE_DIR', '../../../../')
+    base_dir = File.expand_path(base_dir_location, __FILE__)
+
+    build_dir = File.join(base_dir, 'build')
     version_dir = Stemcell::Builder::validate_env_dir('VERSION_DIR')
 
     version = File.read(File.join(version_dir, 'number')).chomp
-    agent_commit = File.read(File.join(build_root, 'compiled-agent', 'sha')).chomp
+    agent_commit = File.read(File.join(build_dir, 'compiled-agent', 'sha')).chomp
 
     output_directory = File.absolute_path('bosh-windows-stemcell')
     FileUtils.mkdir_p(output_directory)

lib/tasks/build/gcp.rake

@@ -4,7 +4,10 @@ require 'json'
 namespace :build do
   desc 'Build GCP Stemcell'
   task :gcp do
-    build_dir = File.expand_path("../../../../build", __FILE__)
+    base_dir_location = ENV.fetch('BUILD_BASE_DIR', '../../../../')
+    base_dir = File.expand_path(base_dir_location, __FILE__)
+
+    build_dir = File.join(base_dir, 'build')
 
     version_dir = Stemcell::Builder::validate_env_dir('VERSION_DIR')
     base_image_dir = Stemcell::Builder::validate_env_dir('BASE_IMAGE_DIR')

spec/integration/build/aws_spec.rb

@@ -7,12 +7,12 @@
 require 'zlib'
 require 's3'
 
-load File.expand_path('../../../../lib/tasks/build/aws.rake', __FILE__)
+load File.join(REPO_ROOT, 'lib/tasks/build/aws.rake')
 
 describe 'Aws' do
   before(:each) do
     @original_env = ENV.to_hash
-    @build_dir = File.expand_path('../../../../build', __FILE__)
+    @build_dir = File.join(REPO_ROOT, 'build')
     @version_dir = Dir.mktmpdir('aws')
     @agent_dir = Dir.mktmpdir('aws')
     @base_amis_dir = Dir.mktmpdir('aws')
@@ -31,7 +31,7 @@
     ENV['PACKER_AWS_ACCESS_KEY'] = @aws_access_key = 'some-aws_access_key'
     ENV['PACKER_AWS_SECRET_KEY'] = @aws_secret_key = 'some-aws_secret_key'
     ENV['OS_VERSION'] = @os_version
-    ENV['PATH'] = "#{File.join(File.expand_path('../../../..', __FILE__), 'spec', 'fixtures', 'aws')}:#{ENV['PATH']}"
+    ENV['PATH'] = "#{fixture_path('aws')}:#{ENV['PATH']}"
     ENV['VERSION_DIR'] = @version_dir
     ENV['BASE_AMIS_DIR'] = @base_amis_dir
     ENV['OUTPUT_BUCKET_REGION'] = @output_bucket_region = 'some-output-bucket-region'
@@ -133,8 +133,7 @@
       )
 
       ENV['DEFAULT_STEMCELL_DIR'] = @default_stemcell_dir = Dir.mktmpdir
-      fixtures_dir = File.join('spec', 'fixtures', 'aws', 'amis')
-      FileUtils.cp(Dir[File.join(fixtures_dir, '*1200*-us-east-1.tgz')].first, @default_stemcell_dir)
+      FileUtils.cp(Dir[fixture_path( 'aws', 'amis', '*1200*-us-east-1.tgz')].first, @default_stemcell_dir)
 
       ENV['REGIONS'] = 'us-east-2'
       @copied_stemcells_dir = 'copied-regional-stemcells'
@@ -236,12 +235,10 @@
           {'region' => 'us-east-1', 'ami_id' => 'ami-east1id'}.to_json
       )
 
-      fixtures_dir = File.join('spec', 'fixtures', 'aws', 'amis')
-
-      FileUtils.cp(Dir[File.join(fixtures_dir, '*1200*-some-region-1.tgz')].first, @copied1)
-      FileUtils.cp(Dir[File.join(fixtures_dir, '*1200*-some-region-2.tgz')].first, @copied2)
-      FileUtils.cp(Dir[File.join(fixtures_dir, '*1200*-some-region-3.tgz')].first, @copied2)
-      FileUtils.cp(Dir[File.join(fixtures_dir, '*1200*-us-east-1.tgz')].first, @copied1)
+      FileUtils.cp(Dir[fixture_path('aws', 'amis', '*1200*-some-region-1.tgz')].first, @copied1)
+      FileUtils.cp(Dir[fixture_path('aws', 'amis', '*1200*-some-region-2.tgz')].first, @copied2)
+      FileUtils.cp(Dir[fixture_path('aws', 'amis', '*1200*-some-region-3.tgz')].first, @copied2)
+      FileUtils.cp(Dir[fixture_path('aws', 'amis', '*1200*-us-east-1.tgz')].first, @copied1)
     end
 
     after(:each) do

spec/integration/build/azure_spec.rb

@@ -6,12 +6,12 @@
 require 'yaml'
 require 'zlib'
 
-load File.expand_path('../../../../lib/tasks/build/azure.rake', __FILE__)
+load File.join(REPO_ROOT, 'lib/tasks/build/azure.rake')
 
 describe 'Azure' do
   before(:each) do
     @original_env = ENV.to_hash
-    @build_dir = File.expand_path('../../../../build', __FILE__)
+    @build_dir = File.join(REPO_ROOT, 'build')
     @output_directory = 'bosh-windows-stemcell'
     @version_dir = Dir.mktmpdir('azure')
     @stemcell_deps_dir = Dir.mktmpdir('azure')
@@ -52,7 +52,7 @@
       ENV['SKU'] = 'some-sku'
       ENV['OS_VERSION'] = os_version
       ENV['VERSION_DIR'] = @version_dir
-      ENV['PATH'] = "#{File.join(@build_dir, '..', 'spec', 'fixtures', 'azure')}:#{ENV['PATH']}"
+      ENV['PATH'] = "#{fixture_path('azure')}:#{ENV['PATH']}"
       ENV['BASE_IMAGE'] = 'some-base-image'
       ENV['BASE_IMAGE_OFFER'] = 'some-base-image-offer'
       ENV['STEMCELL_DEPS_DIR'] = @stemcell_deps_dir

spec/integration/build/gcp_spec.rb

@@ -6,12 +6,12 @@
 require 'yaml'
 require 'zlib'
 
-load File.expand_path('../../../../lib/tasks/build/gcp.rake', __FILE__)
+load File.join(REPO_ROOT, 'lib/tasks/build/gcp.rake')
 
 describe 'Gcp' do
   before(:each) do
     @original_env = ENV.to_hash
-    @build_dir = File.expand_path('../../../../build', __FILE__)
+    @build_dir = File.join(REPO_ROOT, 'build')
     @output_directory = 'bosh-windows-stemcell'
     @version_dir = Dir.mktmpdir('gcp')
     @base_image_dir = Dir.mktmpdir('gcp')
@@ -37,7 +37,7 @@
 
       ENV['ACCOUNT_JSON'] = {'project_id' => 'some-project-id'}.to_json
       ENV['OS_VERSION'] = os_version
-      ENV['PATH'] = "#{File.join(@build_dir, '..', 'spec', 'fixtures', 'gcp')}:#{ENV['PATH']}"
+      ENV['PATH'] = "#{fixture_path('gcp')}:#{ENV['PATH']}"
       ENV['VERSION_DIR'] = @version_dir
       ENV['BASE_IMAGE_DIR'] = @base_image_dir
       ENV['STEMCELL_DEPS_DIR'] = @stemcell_deps_dir

spec/spec_helper.rb

@@ -9,6 +9,13 @@
   SimpleCov.start
 end
 
+SPEC_ROOT = File.dirname(__FILE__).freeze
+REPO_ROOT = Pathname(SPEC_ROOT).parent
+
+def fixture_path(*parts)
+  File.join(SPEC_ROOT, 'fixtures', *parts)
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

spec/stemcell/builder/aws_spec.rb

@@ -17,7 +17,7 @@
   describe 'Aws' do
     describe 'build' do
       it 'builds a stemcell tarball' do
-        os = 'windows2012R2'
+        os = 'windows2019'
         version = '1234.0'
         amis = 'some-amis'
         agent_commit = 'some-agent-commit'
@@ -88,7 +88,7 @@
           aws_access_key = 'some-aws-access-key'
           aws_secret_key = 'some-aws-secret-key'
           packer_vars = 'some-packer-vars'
-          os = 'windows2012R2'
+          os = 'windows2019'
           vm_prefix = 'some-vm-prefix'
 
           packer_config = double(:packer_config)