Remove vSphere code - this is handled by stembuild

Author: aramprice

.gitignore

@@ -1,43 +1,15 @@
+.idea
+.vscode
+
 # Stemcell Builder
 packer_cache
 packer-vmware-iso
-vmware_stemcell
-vmware_stemcell_no_updates
 tmp/
+hotfixes.log
 mkmf.log
-vsphere/network-interface-settings.xml
 scripts/win_iso
 compiled-agent
 
 # BWATS
 bin
 pkg
-
-# Ruby
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-vendor/cache/ruby/
-
-# Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-/build
-/local-builders
-.idea
-.vscode

README.md

@@ -1,21 +1,19 @@
-# BOSH Windows Stemcell Builder (DEPRECATED September 2020) [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://slack.cloudfoundry.org)
+# BOSH Windows Stemcell Builder  [![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://slack.cloudfoundry.org)
 
-BOSH Windows Stemcell Builder will be deprecated by September 2020. The recommended approach for creating local BOSH Windows stemcells which can be deployed on [Cloud Foundry BOSH](https://bosh.io), is [`stembuild`](https://github.com/cloudfoundry/stembuild).
+This repository contains Rake tasks for creating BOSH Windows stemcells for AWS, Azure, GCP, and Openstack
 
-[Documentation on how to use `stembuild` can be found here.](https://bosh.io/docs/windows-stemcell-create/)
-
----
+The recommended approach for creating BOSH Windows stemcells for vSphere which can be deployed on [Cloud Foundry BOSH](https://bosh.io), is [`stembuild`](https://github.com/cloudfoundry/stembuild).
 
-This repo contains a set of scripts for automating the process of building BOSH Windows Stemcells.
+[Documentation on how to use `stembuild` can be found here.](https://bosh.io/docs/windows-stemcell-create/)
 
 #### Contributing
 Please submit PR's to the `develop` branch
 
 #### Dependencies
 
-* [Ruby](https://www.ruby-lang.org/en/downloads/) Latest 2.3.x version
-* [Golang](https://golang.org/dl/) Latest 1.12.x compiler
-* [Packer](https://www.packer.io/downloads.html) for concourse automation
+* [Ruby](https://www.ruby-lang.org/en/downloads/) - see `.ruby-version`
+* [Golang](https://golang.org/dl/) - latest
+* [Packer](https://www.packer.io/downloads.html) - for image creation
 * [Win32-OpenSSH](https://github.com/PowerShell/Win32-OpenSSH) Release [v0.0.18.0](https://github.com/PowerShell/Win32-OpenSSH/releases/tag/v0.0.18.0) is tested.
 
 #### Install
@@ -30,10 +28,6 @@ bundle install
 rake build:aws                                                                 # Build AWS Stemcell
 rake build:azure                                                               # Build Azure Stemcell
 rake build:gcp                                                                 # Build GCP Stemcell
-rake build:vsphere                                                             # Build VSphere Stemcell
-rake build:vsphere_add_updates                                                 # Apply Windows Updates for VMX
-
-rake package:vsphere_ova[ova_file_name,output_directory,version,updates_path]  # Package VSphere OVA files into Stemcells
 
 rake publish:staging:azure                                                     # Stage an image to the Azure marketplace
 rake publish:production:azure                                                  # Publish an image to the Azure marketplace
@@ -42,13 +36,9 @@ rake publish:finalize:azure                                                    #
 rake publish:gcp                                                               # Publish an image to GCP
 ```
 
-In Concourse see [Greenhouse CI](https://github.com/cloudfoundry/greenhouse-ci/tree/master/bosh-windows-stemcell-builder) for required environment variables for these tasks. For example, for `rake build:vsphere` refer to this [task.yml](https://github.com/cloudfoundry/greenhouse-ci/blob/master/bosh-windows-stemcell-builder/create-vsphere-stemcell-from-vmx/task.yml).
-
-Instructions for building a manual stemcell for vSphere can be found in the [wiki](https://github.com/cloudfoundry/bosh-windows-stemcell-builder/wiki/Creating-a-vSphere-Windows-Stemcell).
-
 #### Running the tests
 ```
-bundler exec rspec
+bundle exec rspec
 ```
 
 Acceptance testing for stemcells should be done with [bosh-windows-acceptance-tests](https://github.com/cloudfoundry/bosh-windows-acceptance-tests)

Rakefile

@@ -3,13 +3,10 @@ require_relative 'lib/stemcell/builder'
 import 'lib/tasks/build/aws.rake'
 import 'lib/tasks/build/azure.rake'
 import 'lib/tasks/build/gcp.rake'
-import 'lib/tasks/build/vsphere.rake'
 
 import 'lib/tasks/label/aws.rake'
 import 'lib/tasks/label/gcp.rake'
 
-import 'lib/tasks/package/vsphere_ova.rake'
-
 import 'lib/tasks/publish/azure.rake'
 import 'lib/tasks/publish/gcp.rake'
 

create-manual-vsphere-2016-stemcells.md

@@ -3,4 +3,3 @@
 require_relative 'config/aws'
 require_relative 'config/azure'
 require_relative 'config/gcp'
-require_relative 'config/vsphere'

create-manual-vsphere-stemcells.md

@@ -261,24 +261,6 @@
       "Set-InternetExplorerRegistries"
     ]
   },
-  <% if iaas == "vsphere" %>
-  {
-    "type": "powershell",
-    "inline": [
-      "$ErrorActionPreference = \"Stop\";",
-      "trap { $host.SetShouldExit(1) }",
-      "Optimize-Disk"
-    ]
-  },
-  {
-    "type": "powershell",
-    "inline": [
-      "$ErrorActionPreference = \"Stop\";",
-      "trap { $host.SetShouldExit(1) }",
-      "Compress-Disk"
-    ]
-  }
-  <% else %>
   {
     "type": "powershell",
     "inline": [
@@ -287,5 +269,4 @@
       "Invoke-Sysprep -IaaS <%= iaas %>"
     ]
   }
-  <% end %>
 ]

lib/packer/config.rb

@@ -55,79 +55,6 @@ def rationalize(bucket, key)
       end
   end
 
-  class Vmx
-    def initialize(
-      input_bucket:, output_bucket:,vmx_cache_dir:, endpoint: "")
-      @client = S3::Client.new(endpoint: endpoint)
-      @input_bucket = input_bucket
-      @output_bucket = output_bucket
-      @vmx_cache_dir = vmx_cache_dir
-    end
-
-    def fetch(version)
-      version = version.scan(/(\d+)\./).flatten.first
-
-      Dir.foreach(@vmx_cache_dir) do |path|
-        if /^\d+$/.match(path)
-          if path < version
-            puts "Deleting old cache dir #{File.join(@vmx_cache_dir, path)}"
-            FileUtils.rm_rf(File.join(@vmx_cache_dir, path))
-          end
-        elsif (vmx_version = /vmx-v([\d]+).tgz/.match(path))
-          if vmx_version[1] < version
-            puts "Deleting old cache file #{File.join(@vmx_cache_dir, path)}"
-            FileUtils.rm(File.join(@vmx_cache_dir, path))
-          end
-        end
-      end
-
-      vmx_tarball = File.join(@vmx_cache_dir,"vmx-v#{version}.tgz")
-      puts "Checking for #{vmx_tarball}"
-      if !File.exist?(vmx_tarball)
-        @client.get(@input_bucket,"vmx-v#{version}.tgz",vmx_tarball)
-      else
-        puts "VMX file #{vmx_tarball} found in cache."
-      end
-
-      # Find the vmx directory matching version, untar if not cached
-      vmx_dir=File.join(@vmx_cache_dir,version)
-      puts "Checking for #{vmx_dir}"
-      if !Dir.exist?(vmx_dir)
-        FileUtils.mkdir_p(vmx_dir)
-        exec_command("tar -xzvf #{vmx_tarball} -C #{vmx_dir}")
-      else
-        puts "VMX dir #{vmx_dir} found in cache."
-      end
-
-      find_vmx_file(vmx_dir)
-    end
-
-    def put(vmx_dir, version)
-      version = version.scan(/(\d+)\./).flatten.first
-      version = (version.to_i + 1).to_s
-      vmx_tarball = File.join(@vmx_cache_dir,"vmx-v#{version}.tgz")
-      Dir.chdir(vmx_dir) do
-        exec_command("tar -czvf #{vmx_tarball} *")
-      end
-      @client.put(@output_bucket, "vmx-v#{version}.tgz", vmx_tarball)
-    end
-
-    private
-
-    def find_vmx_file(dir)
-      pattern = File.join(dir, "*.vmx").gsub('\\', '/')
-      files = Dir.glob(pattern)
-      if files.length == 0
-        raise "No vmx files in directory: #{dir}"
-      end
-      if files.length > 1
-        raise "Too many vmx files in directory: #{files}"
-      end
-
-      files[0]
-    end
-  end
-
   def self.test_upload_permissions(bucket, endpoint="")
     puts "Testing upload permissions for #{bucket}"
     tempfile = Tempfile.new("stemcell-permissions-tempfile")

lib/packer/config/templates/provision_windows2019.json.erb

@@ -2,7 +2,6 @@
 require_relative 'builder/aws'
 require_relative 'builder/azure'
 require_relative 'builder/gcp'
-require_relative 'builder/vsphere'
 require_relative '../packer/config'
 require_relative '../packer/runner'
 require_relative 'manifest'