remove anything related to building softlayer.

bosh-stemcell/lib/bosh/stemcell/build_environment.rb

@@ -189,8 +189,6 @@ def exclude_exclusions
         ' --tag ~exclude_on_cloudstack'
       when 'azure'
         ' --tag ~exclude_on_azure'
-      when 'softlayer'
-        ' --tag ~exclude_on_softlayer'
       when 'google'
         ' --tag ~exclude_on_google'
       else

bosh-stemcell/lib/bosh/stemcell/infrastructure.rb

@@ -18,8 +18,6 @@ def self.for(name)
           Vcloud.new
         when 'azure'
           Azure.new
-        when 'softlayer'
-          Softlayer.new
         when 'cloudstack'
           CloudStack.new
         when 'null'
@@ -212,20 +210,5 @@ def additional_cloud_properties
       end
     end
 
-    class Softlayer < Base
-      def initialize
-        super(
-          name: 'softlayer',
-          hypervisor: 'esxi',
-          default_disk_size: 25600,
-          disk_formats: ['ovf'],
-          stemcell_formats: ['softlayer-ovf']
-        )
-      end
-
-      def additional_cloud_properties
-        {'root_device_name' => '/dev/sda1'}
-      end
-    end
   end
 end

bosh-stemcell/lib/bosh/stemcell/stage_collection.rb

@@ -65,8 +65,6 @@ def build_stemcell_image_stages
                  warden_stages
                when Infrastructure::Azure then
                  azure_stages
-               when Infrastructure::Softlayer then
-                 softlayer_stages
                end
 
       stages.concat(finish_stemcell_stages)
@@ -238,26 +236,6 @@ def azure_stages
       ]
     end
 
-    def softlayer_stages
-      [
-        :system_network,
-        :system_softlayer_open_iscsi,
-        :system_softlayer_multipath_tools,
-        :system_softlayer_netplan,
-        :system_parameters,
-        :bosh_clean,
-        :bosh_harden,
-        :bosh_softlayer_agent_settings,
-        :bosh_config_root_ssh_login,
-        :bosh_clean_ssh,
-        # when adding a stage that changes files in the image, do so before
-        # this line.  Image create will make the image so any changes to the
-        # filesystem after it won't apply.
-        :image_create_softlayer_two_partitions,
-        :image_install_grub_softlayer_two_partitions,
-      ]
-    end
-
     def finish_stemcell_stages
       [
         :bosh_package_list,

bosh-stemcell/spec/bosh/stemcell/infrastructure_spec.rb

@@ -12,7 +12,6 @@ module Bosh::Stemcell
         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)
         expect(Infrastructure.for('null')).to be_an(Infrastructure::NullInfrastructure)
       end
@@ -72,7 +71,6 @@ module Bosh::Stemcell
       expect(subject).to_not eq(Infrastructure.for('aws'))
       expect(subject).to_not eq(Infrastructure.for('vsphere'))
       expect(subject).to_not eq(Infrastructure.for('azure'))
-      expect(subject).to_not eq(Infrastructure.for('softlayer'))
     end
 
     it 'defaults to no additional cloud properties' do
@@ -185,18 +183,4 @@ module Bosh::Stemcell
     end
   end
 
-  describe Infrastructure::Softlayer do
-    its(:name)              { should eq('softlayer') }
-    its(:hypervisor)        { should eq('esxi') }
-    its(:default_disk_size) { should eq(25600) }
-    its(:disk_formats)      { should eq(['ovf']) }
-    its(:stemcell_formats)  { should eq(['softlayer-ovf']) }
-
-    it { should eq Infrastructure.for('softlayer') }
-    it { should_not eq Infrastructure.for('vsphere') }
-
-    it 'has softlayer specific additional cloud properties' do
-      expect(subject.additional_cloud_properties).to eq({'root_device_name' => '/dev/sda1'})
-    end
-  end
 end

bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb

@@ -323,35 +323,6 @@ module Bosh::Stemcell
         end
       end
 
-      context 'when using softlayer' do
-        let(:infrastructure) { Infrastructure.for('softlayer') }
-
-        context 'when the 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_softlayer_open_iscsi,
-                :system_softlayer_multipath_tools,
-                :system_softlayer_netplan,
-                :system_parameters,
-                :bosh_clean,
-                :bosh_harden,
-                :bosh_softlayer_agent_settings,
-                :bosh_config_root_ssh_login,
-                :bosh_clean_ssh,
-                :image_create_softlayer_two_partitions,
-                :image_install_grub_softlayer_two_partitions,
-                :bosh_package_list
-              ]
-            )
-            expect(stage_collection.package_stemcell_stages('ovf')).to eq(vmware_package_stemcell_steps)
-          end
-        end
-      end
-
       context 'when using Warden' do
         let(:infrastructure) { Infrastructure.for('warden') }
         let(:build_stemcell_image_stages) {

bosh-stemcell/spec/stemcells/azure_spec.rb

@@ -28,7 +28,6 @@
     exclude_on_vsphere: true,
     exclude_on_warden: true,
     exclude_on_openstack: true,
-    exclude_on_softlayer: true,
   } do
     describe file('/var/vcap/bosh/agent.json') do
       it { should be_valid_json_file }

bosh-stemcell/spec/stemcells/cis_spec.rb

@@ -62,7 +62,6 @@
     exclude_on_warden: true,
     exclude_on_openstack: true,
     exclude_on_cloudstack: true,
-    exclude_on_softlayer: true,
   } do
     it 'confirms that all CIS test cases ran' do
       expect($cis_test_cases.to_a).to match_array(base_cis_test_cases)

bosh-stemcell/spec/stemcells/fips_spec.rb

@@ -60,7 +60,6 @@
     let(:dpkg_list_vsphere_ubuntu) { File.readlines(spec_asset('dpkg-list-ubuntu-jammy-vsphere-additions.txt')).map(&:chop) }
     let(:dpkg_list_azure_ubuntu) { File.readlines(spec_asset('dpkg-list-ubuntu-jammy-azure-additions.txt')).map(&:chop) }
     let(:dpkg_list_cloudstack_ubuntu) { File.readlines(spec_asset('dpkg-list-ubuntu-jammy-cloudstack-additions.txt')).map(&:chop) }
-    let(:dpkg_list_softlayer_ubuntu) { File.readlines(spec_asset('dpkg-list-ubuntu-jammy-softlayer-additions.txt')).map(&:chop) }
     let(:infrastructure) { ENV['STEMCELL_INFRASTRUCTURE'] }
 
     describe command(dpkg_list_packages), {
@@ -71,7 +70,6 @@
       exclude_on_warden: true,
       exclude_on_azure: true,
       exclude_on_openstack: true,
-      exclude_on_softlayer: true,
     } do
       it 'contains only the base set of packages plus aws-specific kernel packages' do
         skip "Test skipped due to generic kernel" unless use_iaas_kernel
@@ -88,7 +86,6 @@
       exclude_on_vcloud: true,
       exclude_on_vsphere: true,
       exclude_on_azure: true,
-      exclude_on_softlayer: true,
     } do
       it 'contains only the base set of packages for alicloud, aws, openstack, warden' do
         skip "Test skipped due to IAAS-specific kernel" if use_iaas_kernel
@@ -105,7 +102,6 @@
       exclude_on_warden: true,
       exclude_on_azure: true,
       exclude_on_openstack: true,
-      exclude_on_softlayer: true,
     } do
       it 'contains only the base set of packages plus google-specific packages' do
         expect(subject.stdout.split("\n")).to match_array(dpkg_list_ubuntu.concat(dpkg_list_fips_ubuntu, dpkg_list_google_ubuntu))
@@ -120,7 +116,6 @@
       exclude_on_warden: true,
       exclude_on_azure: true,
       exclude_on_openstack: true,
-      exclude_on_softlayer: true,
     } do
       it 'contains only the base set of packages plus vsphere-specific packages' do
         expect(subject.stdout.split("\n")).to match_array(dpkg_list_ubuntu.concat(dpkg_list_fips_ubuntu, dpkg_list_vsphere_ubuntu))
@@ -136,7 +131,6 @@
       exclude_on_google: true,
       exclude_on_warden: true,
       exclude_on_openstack: true,
-      exclude_on_softlayer: true,
     } do
       it 'contains only the base set of packages plus azure-specific packages' do
         expect(subject.stdout.split("\n")).to match_array(dpkg_list_ubuntu.concat(dpkg_list_fips_ubuntu, dpkg_list_azure_ubuntu))
@@ -158,20 +152,5 @@
       end
     end
 
-    describe command(dpkg_list_packages), {
-      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,
-      exclude_on_azure: true,
-      exclude_on_openstack: true,
-    } do
-      it 'contains only the base set of packages plus softlayer-specific packages' do
-        expect(subject.stdout.split("\n")).to match_array(dpkg_list_ubuntu.concat(dpkg_list_fips_ubuntu, dpkg_list_softlayer_ubuntu))
-      end
-    end
   end
 end

bosh-stemcell/spec/stemcells/stig_spec.rb

@@ -142,13 +142,6 @@
       ]
     end
 
-    case ENV['IAAS']
-    when 'softlayer'
-      expected_stig_test_cases = expected_stig_test_cases - [
-        'V-38613'
-      ]
-    end
-
     expect($stig_test_cases.to_a).to match_array expected_stig_test_cases
   end
 end