Skip to content

Commit 1e79328

Browse files
committed
Add OS and version to packer output
This adds the OS and version to packer-created files in the storage account. This should make it easier to clean up older stemcells in the future, beyond just checking creation date.
1 parent 8331b34 commit 1e79328

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

lib/packer/config/azure.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def builders
3232
'resource_group_name' => @resource_group_name,
3333
'temp_resource_group_name' => "#{@vm_prefix}-#{Time.now.to_i}",
3434
'storage_account' => @storage_account,
35-
'capture_container_name' => 'packer-stemcells',
36-
'capture_name_prefix' => 'bosh-stemcell',
35+
'capture_container_name' => @os,
36+
'capture_name_prefix' => "bosh-stemcell-#{@os}-#{@version}",
3737
'image_publisher' => 'MicrosoftWindowsServer',
3838
'image_offer' => ENV['BASE_IMAGE_OFFER'],
3939
'image_sku' => ENV['BASE_IMAGE'],

spec/packer/config/azure_spec.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
location: 'some-location',
2424
vm_size: 'some-vm-size',
2525
output_directory: '',
26-
os: os,
27-
version: '',
26+
os: 'test-os',
27+
version: '2019.9999',
2828
vm_prefix: 'some-vm-prefix',
2929
mount_ephemeral_disk: false,
3030
).builders }
@@ -39,8 +39,8 @@
3939
'resource_group_name' => 'some-resource-group-name',
4040
'temp_resource_group_name' => "some-vm-prefix-#{Time.now.to_i}",
4141
'storage_account' => 'some-storage-account',
42-
'capture_container_name' => 'packer-stemcells',
43-
'capture_name_prefix' => 'bosh-stemcell',
42+
'capture_container_name' => 'test-os',
43+
'capture_name_prefix' => 'bosh-stemcell-test-os-2019.9999',
4444
'image_publisher' => 'MicrosoftWindowsServer',
4545
'image_offer' => 'some-base-image-offer',
4646
'image_sku' => 'some-base-image',
@@ -55,8 +55,6 @@
5555
} }
5656

5757
context 'all os versions' do
58-
let(:os) { '' }
59-
6058
it 'returns the expected builders' do
6159
expect(builders[0]).to include(expected_baseline)
6260
end

0 commit comments

Comments
 (0)