From 8ea98c33f16d52439d0fe54701d2bc95e958fd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 21 Apr 2020 16:25:34 +0200 Subject: [PATCH 1/6] Adapt Rakefile and Dockerfile for SLE-15-SP2 --- Dockerfile | 2 +- Rakefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 94abc86..159e190 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest +FROM registry.opensuse.org/yast/sle-15/sp2/containers/yast-ruby COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index 0297288..e691d4a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "yast/rake" +Yast::Tasks.submit_to :sle15sp2 + Yast::Tasks.configuration do |conf| conf.skip_license_check << /\.desktop$/ conf.skip_license_check << /\.svg$/ From 4ce32cb1e4abe791276d163c3ee15fe873d3854c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 31 Mar 2021 08:50:38 +0200 Subject: [PATCH 2/6] Adapt Rakefile and GitHub Actions for SLE-15-SP3 --- .github/workflows/ci.yml | 10 +++++----- Rakefile | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a39a501..3792a64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: [push, pull_request] jobs: Tests: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest steps: @@ -33,7 +33,7 @@ jobs: Rubocop: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest steps: @@ -45,7 +45,7 @@ jobs: Package: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest steps: @@ -57,7 +57,7 @@ jobs: Yardoc: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest steps: @@ -71,7 +71,7 @@ jobs: # checks into one job avoids that overhead Checks: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest steps: diff --git a/Rakefile b/Rakefile index 0297288..2c69c5e 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "yast/rake" +Yast::Tasks.submit_to :sle15sp3 + Yast::Tasks.configuration do |conf| conf.skip_license_check << /\.desktop$/ conf.skip_license_check << /\.svg$/ From 1eb3045f04e2b3d687105ee00a5150c73d14aee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 11 May 2021 18:42:18 +0200 Subject: [PATCH 3/6] Show license in online migration (bsc#1185808) --- src/lib/migration/main_workflow.rb | 12 +++++++++++- test/main_workflow_test.rb | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/migration/main_workflow.rb b/src/lib/migration/main_workflow.rb index 4471d44..5b8a4f2 100644 --- a/src/lib/migration/main_workflow.rb +++ b/src/lib/migration/main_workflow.rb @@ -103,7 +103,11 @@ def run "repositories" => { abort: :abort, rollback: "rollback", - next: "proposals" + next: "license" + }, + "license" => { + abort: "rollback", + next: "proposals" }, "proposals" => { abort: "rollback", @@ -146,6 +150,7 @@ def aliases "perform_migration" => ->() { perform_migration }, "proposals" => ->() { proposals }, "repositories" => ->() { repositories }, + "license" => ->() { license }, "restart_after_migration" => ->() { restart_yast(:restart_after_migration) }, # note: the steps after the YaST restart use the new code from # the updated (migrated) yast2-migration package!! @@ -198,6 +203,11 @@ def repositories Yast::WFM.CallFunction("migration_repos", [{ "enable_back" => false }]) end + # display license for the new base product + def license + Yast::WFM.CallFunction("inst_product_upgrade_license", [{ "enable_back" => false }]) + end + def proposals Yast::WFM.CallFunction("migration_proposals", [{ "hide_export" => true }]) end diff --git a/test/main_workflow_test.rb b/test/main_workflow_test.rb index 25ae444..d8c4899 100644 --- a/test/main_workflow_test.rb +++ b/test/main_workflow_test.rb @@ -35,6 +35,7 @@ def mock_client(name, res) before do mock_client(["migration_repos", [{ "enable_back" => false }]], :next) + mock_client(["inst_product_upgrade_license", [{ "enable_back" => false }]], :next) mock_client(["migration_proposals", [{ "hide_export" => true }]], :next) mock_client("inst_prepareprogress", :next) mock_client("inst_kickoff", :next) From 1c285e7c14041697770b3c5287d929df27169509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 12 May 2021 10:53:49 +0200 Subject: [PATCH 4/6] 4.2.5 --- package/yast2-migration.changes | 7 +++++++ package/yast2-migration.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-migration.changes b/package/yast2-migration.changes index dd4d726..2fd3a44 100644 --- a/package/yast2-migration.changes +++ b/package/yast2-migration.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 08:53:10 UTC 2021 - Ladislav Slezák + +- Show the new base product license in online migration + (bsc#1185808) +- 4.2.5 + ------------------------------------------------------------------- Tue Nov 19 12:00:26 CET 2019 - schubi@suse.de diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec index 356a42f..c56cd24 100644 --- a/package/yast2-migration.spec +++ b/package/yast2-migration.spec @@ -17,7 +17,7 @@ Name: yast2-migration -Version: 4.2.4 +Version: 4.2.5 Release: 0 Summary: YaST2 - Online migration Group: System/YaST From 554566ee190124f6f4f52228d43247b02cc1bdfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 18 May 2021 10:11:42 +0200 Subject: [PATCH 5/6] 4.3.0 --- package/yast2-migration.changes | 2 +- package/yast2-migration.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/yast2-migration.changes b/package/yast2-migration.changes index 2fd3a44..37b5f7b 100644 --- a/package/yast2-migration.changes +++ b/package/yast2-migration.changes @@ -3,7 +3,7 @@ Wed May 12 08:53:10 UTC 2021 - Ladislav Slezák - Show the new base product license in online migration (bsc#1185808) -- 4.2.5 +- 4.3.0 ------------------------------------------------------------------- Tue Nov 19 12:00:26 CET 2019 - schubi@suse.de diff --git a/package/yast2-migration.spec b/package/yast2-migration.spec index c56cd24..0ea89c1 100644 --- a/package/yast2-migration.spec +++ b/package/yast2-migration.spec @@ -17,7 +17,7 @@ Name: yast2-migration -Version: 4.2.5 +Version: 4.3.0 Release: 0 Summary: YaST2 - Online migration Group: System/YaST From 042a759170df6b169ff9c5fa19fd50997c6f9a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 18 May 2021 13:23:21 +0200 Subject: [PATCH 6/6] Revert the SP3 specific changes --- .github/workflows/ci.yml | 10 +++++----- Rakefile | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3792a64..a39a501 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: [push, pull_request] jobs: Tests: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest steps: @@ -33,7 +33,7 @@ jobs: Rubocop: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest steps: @@ -45,7 +45,7 @@ jobs: Package: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest steps: @@ -57,7 +57,7 @@ jobs: Yardoc: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest steps: @@ -71,7 +71,7 @@ jobs: # checks into one job avoids that overhead Checks: runs-on: ubuntu-latest - container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest steps: diff --git a/Rakefile b/Rakefile index 2c69c5e..0297288 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,5 @@ require "yast/rake" -Yast::Tasks.submit_to :sle15sp3 - Yast::Tasks.configuration do |conf| conf.skip_license_check << /\.desktop$/ conf.skip_license_check << /\.svg$/