foreman_maintain 1.0.16 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0daf3332063c9ae83f36cd69d2ddd6608ac10fd14b2cb0c2391210ddd332af80
-  data.tar.gz: 68fcc2ea5a4196afe431ebebec41a66e9c6ed72bf9f7f7e9f123993139dc7257
+  metadata.gz: c1567588355faeafabafe49dfee31db43eeb6c652b61d27ad6041eddb1b6a993
+  data.tar.gz: '0722639fa591f720708cb5bed060416e43a5d5e0312b1dc49d31db2f08a1c061'
 SHA512:
-  metadata.gz: 8e4ad682218a2efdaf3e205974db79ada30359f37aaca377d4485fe474bc0bda9080692890753dec1bd6ed8bd176c7a48a5646be2d77c362bab1f4072f7e5f43
-  data.tar.gz: a9ba1078902c5061bc5f1900dbfec456b1eadcdf13c986efb1bea6a0cd1daa12c06b9dfc6310d3e67dfc1c256fee39d57aabdda58ae899b29729b738fbc7bfe5
+  metadata.gz: c95a6a85ac2ae259a6d7c4f51a86c2b96c53441c9cb6e0762154c04d3122475963615749669b96bf8766136903b96de5da4f33051a23dc9eb6c6db0e2dd31e7a
+  data.tar.gz: 8c92687da1590f99d477a074837ed15745db6b505aac339f9621d1e91cffbbdaa783e091a85d3441935327be7714af8a8289c30b9779549d736e736ff204c816

data/definitions/features/candlepin_database.rb

@@ -75,7 +75,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
   # rubocop:enable Metrics/MethodLength
 
   def extend_with_db_options
-    db_options = { '-d' => construct_database_string }
+    db_options = { '-d' => configuration['database'] }
     if check_option_using_cpdb_help('dbhost')
       db_options['--dbhost'] = configuration['host']
       db_options['--dbport'] = configuration['port']
@@ -83,15 +83,6 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     db_options
   end
 
-  def construct_database_string
-    db_str = configuration['database']
-    extra_opts = []
-    extra_opts << "ssl=#{configuration['ssl']}" if configuration['ssl']
-    extra_opts << "sslfactory=#{configuration['sslfactory']}" if configuration['sslfactory']
-    db_str += "?#{extra_opts.join('&')}" unless extra_opts.empty?
-    db_str
-  end
-
   def fetch_extra_param(url, key_name)
     query_string = url.split('?')[1]
     return nil unless query_string

data/definitions/scenarios/self_upgrade.rb

@@ -2,12 +2,11 @@ module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
     include ForemanMaintain::Concerns::Downstream
     def target_version
-      current_full_version = feature(:instance).downstream.current_version
-      @target_version ||= current_full_version.bump
+      @target_version ||= Gem::Version.new(current_version).bump.to_s
     end
 
     def current_version
-      feature(:instance).downstream.current_minor_version
+      feature(:instance).downstream.current_version.to_s[/^\d+\.\d+\.\d+/]
     end
 
     def maintenance_repo_label

data/lib/foreman_maintain/concerns/downstream.rb

@@ -66,7 +66,8 @@ module ForemanMaintain
         server_version_full = "#{server_version.major}.#{server_version.minor}"
         rh_repos.concat(product_specific_repos(server_version_full))
         if server_version > version('6.3')
-          rh_repos << ansible_repo(server_version)
+          ansible_repo = ansible_repo(server_version)
+          rh_repos << ansible_repo if ansible_repo
         end
 
         rh_repos
@@ -83,8 +84,6 @@ module ForemanMaintain
 
         if el7?
           "rhel-#{el_major_version}-server-ansible-#{ansible_version}-rpms"
-        else
-          "ansible-#{ansible_version}-for-rhel-#{el_major_version}-x86_64-rpms"
         end
       end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.16'.freeze
+  VERSION = '1.0.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.18
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: minitest-stub-const
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides various features that helps keeping the Foreman/Satellite up
   and running.
 email: inecas@redhat.com
@@ -468,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt