foreman_leapp 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8a780a7e99e97ff8522fcf364eee8758e52d85798cbabd0ece68f1dbd5d249
-  data.tar.gz: 7815d710b788c121ec6b22b860b7f71d484feafb3ed78eba43a985506a1c0bca
+  metadata.gz: af697afeb0e8d96dfd208fbded7b7eb14fe4e1713a0fb1ae9d98265a9be27948
+  data.tar.gz: dee96e5df9792f7ddb048020e70dec335fe0c0b533e006544bdbb267c980172a
 SHA512:
-  metadata.gz: ae638917262ab9065a9c1479ffab9e7dc4377bed8ee0b09675e870ff0d309de452d909f5735ea73cecb062f77b1ecde359cd7e8d9f965da1a8ffc834cc270275
-  data.tar.gz: f34e753b0fae01cb17eaaf9038ac55dfaa9bcbafce47b1d71e83118a92cae878da492bfa8d695ea5dd0ce3287263fb2532eb629e3f21cfd4fdc45d966d07c385
+  metadata.gz: 86187202b78ab26e603ab44fa666ae26d626f21e9cd4ffe8a5626be0eeb85dd4d38dc28ef3d942cd8c14323a34cc90e69e83e49163fb75b0114bb09afaf2e644
+  data.tar.gz: 31991aa8b5bdb1839ae1fc916786ade5ab24a08117963d9094efffbd7d23914e43d5b0878cade7f849cdcdbde42caf8a31b332b224c0f0ccb9cb124c6bfc92b8

data/README.md

@@ -14,6 +14,14 @@ The plugin will add following jobs:
 - Remediation plan
 - Run upgrade via Leapp
 
+### Channel
+
+Leapp by default will use the same "channel" (e4s, eus, aus) as the current OS, so if you are using "eus" repositories, the target OS will be on "eus" repositories as well.
+But if you are upgrading and want to target a different channel, i.e. from a RHEL 7.9 to a RHEL 8.6 EUS, you can do it by explicitely setting the channel to "eus".
+
+The channel have to be specified in both the preupgrade and upgrade jobs.
+Default value of "channel" is "ga" - General availability: regular repositories are used by default.
+
 ## Api
 - `GET /api/preupgrade_reports` List Preupgrade reports
 - `GET /api/preupgrade_reports/:id` Show Preupgrade report

data/app/views/foreman_leapp/job_templates/leapp_preupgrade.erb

@@ -6,12 +6,22 @@ description_format: 'Upgradeability check for RHEL host'
 provider_type: SSH
 feature: leapp_preupgrade
 model: JobTemplate
+template_inputs:
+- name: Channel
+  description: "Set if the target OS is required to use the General Availability (GA) channel - the default - or a specific channel among: Update Services for SAP Solutions (E4S), Extended Upgrade Support (EUS) or Advanced Update Support (AUS)."
+  input_type: user
+  required: true
+  default: "ga"
+  options: "ga\ne4s\neus\naus"
+%>
+<%
+  channel_opts = input('Channel') == 'ga' ? '' : "--channel #{input('Channel')}"
 %>
 
 <%= render_template 'Check Leapp' %>
 
 rm -f /var/log/leapp/leapp-report.json
-leapp preupgrade
+leapp preupgrade <%= channel_opts %>
 
 echo "===leap_upgrade_report_start==="
 cat /var/log/leapp/leapp-report.json

data/app/views/foreman_leapp/job_templates/leapp_upgrade.erb

@@ -7,6 +7,12 @@ provider_type: Ansible
 feature: leapp_upgrade
 model: JobTemplate
 template_inputs:
+- name: Channel
+  description: "Set if the target OS is required to use the General Availability (GA) channel - the default - or a specific channel among: Update Services for SAP Solutions (E4S), Extended Upgrade Support (EUS) or Advanced Update Support (AUS)."
+  input_type: user
+  required: true
+  default: "ga"
+  options: "ga\ne4s\neus\naus"
 - name: Reboot
   description: Reboot the host automaticaly to continue with the upgrade
   input_type: user
@@ -16,9 +22,12 @@ template_inputs:
 %>
 ---
 - hosts: all
+  vars:
+    - channel_opts: <% input('Channel') == 'ga' ? '' : "--channel #{input('Channel')}" %>
   tasks:
     - name: Run Leapp Upgrade
-      command: leapp upgrade
+      command: leapp upgrade {{ channel_opts }}
+
 <%- if input('Reboot') == "true" -%>
     - name: Reboot the machine
       reboot:

data/lib/foreman_leapp/engine.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'foreman_ansible'
+require 'foreman_remote_execution'
+
 module ForemanLeapp
   class Engine < ::Rails::Engine
     engine_name 'foreman_leapp'

data/lib/foreman_leapp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanLeapp
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

data/lib/tasks/foreman_leapp_tasks.rake

@@ -15,7 +15,7 @@ end
 # Tests
 namespace :test do
   desc 'Test ForemanLeapp'
-  Rake::TestTask.new(:foreman_leapp) do |t|
+  Rake::TestTask.new(:foreman_leapp => ['db:test:prepare']) do |t|
     test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
     t.libs << ['test', test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"

data/package.json

@@ -9,10 +9,7 @@
     "test": "tfm-test --plugin --config jest.config.js",
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
-    "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
-    "stories:deploy": "surge --project .storybook-dist"
+    "publish-coverage": "tfm-publish-coverage"
   },
   "repository": {
     "type": "git",
@@ -25,15 +22,15 @@
   },
   "homepage": "https://github.com/oamg/foreman_leapp",
   "peerDependencies": {
-    "@theforeman/vendor": ">= 8.16.0"
+    "@theforeman/vendor": ">= 12.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@theforeman/builder": ">= 12.0.1",
-    "@theforeman/eslint-plugin-foreman": "^10.0",
-    "@theforeman/stories": "^10.0",
-    "@theforeman/test": "^10.0",
-    "@theforeman/vendor-dev": "^10.0",
+    "@theforeman/eslint-plugin-foreman": ">= 12.0.1",
+    "@theforeman/eslint-plugin-rules": ">= 12.0.1",
+    "@theforeman/test": ">= 12.0.1",
+    "@theforeman/vendor-dev": ">= 12.0.1",
     "babel-eslint": "^10.0.0",
     "eslint": "^6.8.0",
     "jest-svg-transformer": "^1.0.0",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_leapp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Foreman Leapp team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Foreman plugin for Leapp utility.
@@ -240,6 +240,6 @@ test_files:
 - test/helpers/template_helper_test.rb
 - test/models/preupgrade_report_entry_test.rb
 - test/models/preupgrade_report_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/preupgrade_job_test.rb
 - test/unit/helpers/job_helper_test.rb
-- test/test_plugin_helper.rb