Merge remote-tracking branch 'local-from/develop' into HEAD

cloudfoundry · Dec 20, 2019 · 3fe9422 · 3fe9422
2 parents 7c1f30c + bfd1676
commit 3fe9422
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/lib/packer/config/aws.rb b/lib/packer/config/aws.rb
@@ -19,9 +19,7 @@ def builders
         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 == 'windows2019' && @region[:name].include?('gov')
-          source_ami = "ami-a180cfc0"
-        elsif @os == 'windows2012R2'
+        if @os == 'windows2012R2'
           source_ami = "ami-067ff23da8261d1c7"
         end
         [

diff --git a/spec/packer/config/aws_spec.rb b/spec/packer/config/aws_spec.rb
@@ -106,7 +106,6 @@
 
 
         expect(gov_builders[0]).to include(baseline_builders.merge({
-                                                                       source_ami: "ami-a180cfc0",
                                                                        region: 'region1-gov',
                                                                        name: "amazon-ebs-region1-gov"}))
         expect(gov_builders[0][:ami_name]).to match(/BOSH-.*-region1/)