Merge pull request #506 from clintoncwolfe/cw/rhel-7-search

Prefer non-Beta RHEL AMIs in search; remove encoding comments
test-kitchen · Aug 14, 2020 · a36eabc · a36eabc
2 parents 7a0fcf1 + db0fcd5
commit a36eabc
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 12 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:test)

diff --git a/kitchen-ec2.gemspec b/kitchen-ec2.gemspec
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "kitchen/driver/ec2_version.rb"

diff --git a/lib/kitchen/driver/aws/client.rb b/lib/kitchen/driver/aws/client.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/lib/kitchen/driver/aws/instance_generator.rb b/lib/kitchen/driver/aws/instance_generator.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/lib/kitchen/driver/aws/standard_platform/rhel.rb b/lib/kitchen/driver/aws/standard_platform/rhel.rb
@@ -50,6 +50,13 @@ def self.from_image(driver, image)
               new(driver, "rhel", (Regexp.last_match || [])[1], image.architecture)
             end
           end
+
+          def sort_by_version(images)
+            # First do a normal version sort
+            super(images)
+            # Now sort again, shunning Beta releases.
+            prefer(images) { |image| !image.name.match(/_Beta-/i) }
+          end
         end
       end
     end

diff --git a/lib/kitchen/driver/ec2.rb b/lib/kitchen/driver/ec2.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<[email protected]>)
 #

diff --git a/lib/kitchen/driver/ec2_version.rb b/lib/kitchen/driver/ec2_version.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<[email protected]>)
 #

diff --git a/spec/kitchen/driver/aws/client_spec.rb b/spec/kitchen/driver/aws/client_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/spec/kitchen/driver/aws/instance_generator_spec.rb b/spec/kitchen/driver/aws/instance_generator_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/spec/kitchen/driver/aws/standard_platform_spec.rb b/spec/kitchen/driver/aws/standard_platform_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/spec/kitchen/driver/ec2_spec.rb b/spec/kitchen/driver/ec2_spec.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Tyler Ball (<[email protected]>)
 #

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<[email protected]>)
 #