Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Noble remove vcloud #396

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Noble remove vcloud #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bosh-stemcell/lib/bosh/stemcell/build_environment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@ def exclude_exclusions
' --tag ~exclude_on_alicloud'
when 'vsphere'
' --tag ~exclude_on_vsphere'
when 'vcloud'
' --tag ~exclude_on_vcloud'
when 'warden'
' --tag ~exclude_on_warden'
when 'aws'
Expand Down
2 changes: 1 addition & 1 deletion bosh-stemcell/lib/bosh/stemcell/builder_options.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def default
)

def ovf_options
if infrastructure.name == 'vsphere' || infrastructure.name == 'vcloud'
if infrastructure.name == 'vsphere'
{ 'image_ovftool_path' => environment['OVFTOOL'] }
else
{}
Expand Down
18 changes: 0 additions & 18 deletions bosh-stemcell/lib/bosh/stemcell/infrastructure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ def self.for(name)
Vsphere.new
when 'warden'
Warden.new
when 'vcloud'
Vcloud.new
when 'azure'
Azure.new
when 'softlayer'
Expand Down Expand Up @@ -114,22 +112,6 @@ def additional_cloud_properties
end
end

class Vcloud < Base
def initialize
super(
name: 'vcloud',
hypervisor: 'esxi',
default_disk_size: 5120,
disk_formats: ['ovf'],
stemcell_formats: ['vcloud-ova', 'vcloud-ovf']
)
end

def additional_cloud_properties
{'root_device_name' => '/dev/sda1'}
end
end

class Aws < Base
def initialize
super(
Expand Down
6 changes: 2 additions & 4 deletions bosh-stemcell/lib/bosh/stemcell/stage_collection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ def build_stemcell_image_stages
when Infrastructure::OpenStack then
openstack_stages
when Infrastructure::Vsphere then
vsphere_vcloud_stages
when Infrastructure::Vcloud then
vsphere_vcloud_stages
vsphere_stages
when Infrastructure::Warden then
warden_stages
when Infrastructure::Azure then
Expand Down Expand Up @@ -130,7 +128,7 @@ def cloudstack_stages
end


def vsphere_vcloud_stages
def vsphere_stages
[
:system_network,
:system_open_vm_tools,
Expand Down
23 changes: 0 additions & 23 deletions bosh-stemcell/spec/bosh/stemcell/builder_options_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,29 +164,6 @@ def self.it_sets_correct_environment_variables
end
end

context 'when infrastruture is vcloud' do
let(:infrastructure) { Infrastructure.for('vcloud') }
let(:default_disk_size) { 5120 }

it_sets_correct_environment_variables

it 'has an "image_ovftool_path" key' do
result = stemcell_builder_options.default

expect(result['image_ovftool_path']).to be_nil
end

context 'if you have OVFTOOL set in the environment' do
let(:env) { { 'OVFTOOL' => 'fake_ovf_tool_path' } }

it 'sets image_ovftool_path' do
result = stemcell_builder_options.default

expect(result['image_ovftool_path']).to eq('fake_ovf_tool_path')
end
end
end

context 'when infrastructure is openstack' do
let(:infrastructure) { Infrastructure.for('openstack') }
let(:default_disk_size) { 5120 }
Expand Down
17 changes: 0 additions & 17 deletions bosh-stemcell/spec/bosh/stemcell/infrastructure_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module Bosh::Stemcell
expect(Infrastructure.for('google')).to be_an(Infrastructure::Google)
expect(Infrastructure.for('vsphere')).to be_a(Infrastructure::Vsphere)
expect(Infrastructure.for('warden')).to be_a(Infrastructure::Warden)
expect(Infrastructure.for('vcloud')).to be_a(Infrastructure::Vcloud)
expect(Infrastructure.for('azure')).to be_a(Infrastructure::Azure)
expect(Infrastructure.for('softlayer')).to be_a(Infrastructure::Softlayer)
expect(Infrastructure.for('cloudstack')).to be_a(Infrastructure::CloudStack)
Expand Down Expand Up @@ -155,21 +154,6 @@ module Bosh::Stemcell
end
end

describe Infrastructure::Vcloud do
its(:name) { should eq('vcloud') }
its(:hypervisor) { should eq('esxi') }
its(:default_disk_size) { should eq(5120) }
its(:disk_formats) { should eq(['ovf']) }
its(:stemcell_formats) { should eq(['vcloud-ova', 'vcloud-ovf']) }

it { should eq Infrastructure.for('vcloud') }
it { should_not eq Infrastructure.for('vsphere') }

it 'has vcloud specific additional cloud properties' do
expect(subject.additional_cloud_properties).to eq({'root_device_name' => '/dev/sda1'})
end
end

describe Infrastructure::Azure do
its(:name) { should eq('azure') }
its(:hypervisor) { should eq('hyperv') }
Expand All @@ -178,7 +162,6 @@ module Bosh::Stemcell
its(:stemcell_formats) { should eq(['azure-vhd']) }

it { should eq Infrastructure.for('azure') }
it { should_not eq Infrastructure.for('vcloud') }

it 'has azure specific additional cloud properties' do
expect(subject.additional_cloud_properties).to eq({'root_device_name' => '/dev/sda1'})
Expand Down
28 changes: 0 additions & 28 deletions bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,34 +261,6 @@ module Bosh::Stemcell
end
end

context 'when using vCloud' do
let(:infrastructure) { Infrastructure.for('vcloud') }

context 'when operating system is Ubuntu' do
let(:operating_system) { OperatingSystem.for('ubuntu') }

it 'has the correct stages' do
expect(stage_collection.build_stemcell_image_stages).to eq(
[
:system_network,
:system_open_vm_tools,
:system_vsphere_cdrom,
:system_parameters,
:bosh_clean,
:bosh_harden,
:bosh_vsphere_agent_settings,
:bosh_clean_ssh,
:image_create_efi,
:image_install_grub,
:sbom_create,
:bosh_package_list,
]
)
expect(stage_collection.package_stemcell_stages('ovf')).to eq(vmware_package_stemcell_steps)
end
end
end

context 'when using Azure' do
let(:infrastructure) { Infrastructure.for('azure') }

Expand Down
1 change: 0 additions & 1 deletion bosh-stemcell/spec/stemcells/azure_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_google: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_warden: true,
exclude_on_openstack: true,
Expand Down
1 change: 0 additions & 1 deletion bosh-stemcell/spec/stemcells/cis_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_google: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_warden: true,
exclude_on_openstack: true,
Expand Down
6 changes: 0 additions & 6 deletions bosh-stemcell/spec/stemcells/fips_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
describe command(dpkg_list_packages), {
exclude_on_alicloud: true,
exclude_on_cloudstack: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_warden: true,
exclude_on_azure: true,
Expand All @@ -85,7 +84,6 @@
describe command(dpkg_list_packages), {
exclude_on_cloudstack: true,
exclude_on_google: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_azure: true,
exclude_on_softlayer: true,
Expand All @@ -100,7 +98,6 @@
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_cloudstack: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_warden: true,
exclude_on_azure: true,
Expand Down Expand Up @@ -131,7 +128,6 @@
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_cloudstack: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_google: true,
exclude_on_warden: true,
Expand All @@ -146,7 +142,6 @@
describe command(dpkg_list_packages), {
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_google: true,
exclude_on_warden: true,
Expand All @@ -162,7 +157,6 @@
exclude_on_alicloud: true,
exclude_on_aws: true,
exclude_on_cloudstack: true,
exclude_on_vcloud: true,
exclude_on_vsphere: true,
exclude_on_google: true,
exclude_on_warden: true,
Expand Down
Loading