Merge pull request chef#971 from chef/rel-20180.01.02

Release 201801.02.0

CHANGELOG.md

@@ -1,5 +1,52 @@
 # Change Log
 
+## [201801.02.0](https://github.com/chef/bento/tree/201801.02.0) (2018-01-02)
+
+**New Platforms**
+- Debian 9.3
+- Debian 8.10
+- Fedora 27
+
+**Hyper-V Boxes (experimental)
+- centos-7.4
+- centos-6.9
+- ubuntu-17.10
+- ubuntu-17.04
+- ubuntu-16.04
+- ubuntu-14.04
+
+**Tooling**
+- VirtualBox 5.2.4
+- VMware Fusion 10.1.0
+- Parallels 13.2.0
+- Hyper-V 10.0.16299.15
+- Packer 1.1.3
+- Vagrant 2.0.1
+
+## [201710.31.0](https://github.com/chef/bento/tree/201710.31.0) (2017-10-31)
+
+**New Platforms**
+- Ubuntu 17.10
+- Debian 9.2
+- Debian 8.10
+- FreeBSD 10.4
+- CentOS 7.4
+
+**Tooling**
+- VirtualBox 5.1.30
+- VMware Fusion 10.0.1
+- Parallels 13.1.1
+- Packer 1.1.1
+- Vagrant 2.0.0
+
+**Fixes/Updates**
+- SLES fixes
+- 1GB of RAM as default for boxen
+- re-organized into platform folders
+- hyper-V fixes
+- qemu fixes
+
+
 ## [201708.22.0](https://github.com/chef/bento/tree/201708.22.0) (2017-08-22)
 
 **New**

Rakefile

@@ -1,23 +1,24 @@
 require "yaml"
+require "fileutils"
 
 desc "clean, build, test, upload"
 task :do_all do
   check_env
-  templates.each do |template|
-    Rake::Task["clean"].invoke
-    Rake::Task["clean"].reenable
-    sh build_cmd(template)
-    sh "bento test"
-    unless ENV["BENTO_AUTO_RELEASE"].nil?
-      sh "bento upload"
-      sh "bento release #{template} #{ENV["BENTO_VERSION"]}"
+  public_templates.each do |template|
+    if config['public'].include?(box_name(template))
+      sh build_cmd(template)
+      sh "bento test"
+      unless ENV["BENTO_AUTO_RELEASE"].nil?
+        sh "bento upload"
+        sh "bento release #{template} #{ENV["BENTO_VERSION"]}"
+      end
     end
   end
 end
 
 desc "clean"
 task :clean do
-  sh "rm -rf builds/* .kitchen.yml"
+  FileUtils.rm_rf(['.kitchen.yml', Dir.glob('builds/*')])
 end
 
 def build_cmd(template)
@@ -58,27 +59,12 @@ def clean_array(*args)
   args.flatten.reject { |i| i.nil? || i == "" }.map(&:to_s)
 end
 
-# create sorted list of builds matched against available templates
-# ignoring known private images and working dir
-# TODO: move this logic to bento-ya
-def templates
-  ts = Dir.glob('**/*.json').reject{ |f| f['builds'] }
-  ts.reject{ |f| f[/macos|rhel|sles|solaris|windows/] }
+def box_name(template)
+  bn = template.split('/')[1].gsub!(/\.json/,'')
+  bn.match(/-x86_64|-amd64/) ? bn.gsub(/-x86_64|-amd64/,'') : bn
+end
 
-  b32 = []
-  b64 = []
-  config['public'].each do |p, vs|
-    vs.each do |v, as|
-      as.each do |a|
-        case a
-        when "i386", "i686"
-          b32 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] }
-        else
-          b64 << ts.select{ |i| i[/#{p}-#{v}-#{a}/] }
-        end
-      end
-    end
-  end
-  list = b64 + b32
-  list.flatten
+def public_templates
+  templates = Dir.glob('**/*.json').reject{ |d| d['builds'] }
+  templates.reject{ |f| f[/macos|rhel|sles|solaris|windows/] }
 end

builds.yml

@@ -5,37 +5,30 @@ providers:
   - vmware-iso
 
 public:
-  centos:
-  - '7.4'
-  - '6.9'
-  - '6.9-i386'
-  oracle:
-  - '7.3'
-  - '6.9'
-  - '6.9-i386'
-  ubuntu:
-  - '17.10'
-  - '17.10-i386'
-  - '17.04'
-  - '17.04-i386'
-  - '16.04'
-  - '16.04-i386'
-  - '14.04'
-  - '14.04-i386'
-  debian:
-  - '9.3'
-  - '8.10'
-  - '8.10-i386'
-  - '7.11'
-  - '7.11-i386'
-  fedora:
-  - '27'
-  - '26'
-  opensuse-leap:
-  - '42.3'
-  freebsd:
-  - '11.1'
-  - '10.4'
+- 'centos-7.4'
+- 'centos-6.9'
+- 'centos-6.9-i386'
+- 'oracle-7.3'
+- 'oracle-6.9'
+- 'oracle-6.9-i386'
+- 'ubuntu-17.10'
+- 'ubuntu-17.10-i386'
+- 'ubuntu-17.04'
+- 'ubuntu-17.04-i386'
+- 'ubuntu-16.04'
+- 'ubuntu-16.04-i386'
+- 'ubuntu-14.04'
+- 'ubuntu-14.04-i386'
+- 'debian-9.3'
+- 'debian-8.10'
+- 'debian-8.10-i386'
+- 'debian-7.11'
+- 'debian-7.11-i386'
+- 'fedora-27'
+- 'fedora-26'
+- 'opensuse-leap-42.3'
+- 'freebsd-11.1'
+- 'freebsd-10.4'
 
 slugs:
   'centos-7': 'centos-7.4'