Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 891891 : "Installed addons/modules/extensions not visible in AddOn yast module" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-08-22 15:44:10.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-08-25 11:18:46.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 25 08:21:18 UTC 2014 - lslezak@suse.cz + +- select and install extension/module products also in installed + system (bnc#891891) +- 3.1.109 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:43088 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.108.tar.bz2 New: ---- yast2-registration-3.1.109.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.j3o76P/_old 2014-08-25 15:38:40.000000000 +0200 +++ /var/tmp/diff_new_pack.j3o76P/_new 2014-08-25 15:38:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.108 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.108.tar.bz2 -> yast2-registration-3.1.109.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/package/yast2-registration.changes new/yast2-registration-3.1.109/package/yast2-registration.changes --- old/yast2-registration-3.1.108/package/yast2-registration.changes 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/package/yast2-registration.changes 2014-08-25 11:14:34.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 25 08:21:18 UTC 2014 - lslezak@suse.cz + +- select and install extension/module products also in installed + system (bnc#891891) +- 3.1.109 + +------------------------------------------------------------------- Thu Aug 21 09:41:10 UTC 2014 - lslezak@suse.cz - save the registration settings to autoinst.xml at the end of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/package/yast2-registration.spec new/yast2-registration-3.1.109/package/yast2-registration.spec --- old/yast2-registration-3.1.108/package/yast2-registration.spec 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/package/yast2-registration.spec 2014-08-25 11:14:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.108 +Version: 3.1.109 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/clients/inst_scc.rb new/yast2-registration-3.1.109/src/clients/inst_scc.rb --- old/yast2-registration-3.1.108/src/clients/inst_scc.rb 2014-08-22 11:29:46.000000000 +0200 +++ new/yast2-registration-3.1.109/src/clients/inst_scc.rb 2014-08-25 11:14:34.000000000 +0200 @@ -441,6 +441,9 @@ # select repositories to use in installation (e.g. enable/disable Updates) select_repositories(product_service) if Mode.installation || Mode.update + # remember the added service + ::Registration::Storage::Cache.instance.addon_services << product_service + # move from selected to registered product.registered @selected_addons.reject!{|selected| selected.identifier == product.identifier} @@ -589,6 +592,16 @@ :next end + def pkg_manager + # during installation the products are installed together with the base + # product, run the package manager only in installed system + return :next unless Mode.normal + + ::Registration::SwMgmt.select_addon_products + + WFM.call("sw_single") + end + # UI workflow definition def start_workflow aliases = { @@ -599,7 +612,8 @@ "update" => [ lambda { update_registration() }, true ], "addon_eula" => lambda { addon_eula() }, "register_addons" => lambda { register_addons() }, - "update_autoyast_config" => lambda { update_autoyast_config() } + "update_autoyast_config" => lambda { update_autoyast_config() }, + "pkg_manager" => lambda { pkg_manager() } } sequence = { @@ -639,6 +653,11 @@ :next => "update_autoyast_config" }, "update_autoyast_config" => { + :abort => :abort, + :next => "pkg_manager" + }, + "pkg_manager" => { + :abort => :abort, :next => :next } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/lib/registration/storage.rb new/yast2-registration-3.1.109/src/lib/registration/storage.rb --- old/yast2-registration-3.1.108/src/lib/registration/storage.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/src/lib/registration/storage.rb 2014-08-25 11:14:34.000000000 +0200 @@ -50,13 +50,13 @@ end end - class Cache < Struct.new(:available_addons, :first_run, :registered_addons, + class Cache < Struct.new(:available_addons, :first_run, :addon_services, :reg_url, :reg_url_cached) include Singleton def initialize - self.registered_addons = [] + self.addon_services = [] self.first_run = true end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.109/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-3.1.108/src/lib/registration/sw_mgmt.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/src/lib/registration/sw_mgmt.rb 2014-08-25 11:14:34.000000000 +0200 @@ -348,6 +348,32 @@ end end + # select products for new added extensions/modules + def self.select_addon_products + addon_services = ::Registration::Storage::Cache.instance.addon_services + log.info "New addon services: #{addon_services}" + + new_repos = addon_services.reduce([]) do |acc, service| + acc.concat(::Registration::SwMgmt.service_repos(service)) + end + + return if new_repos.empty? + + products = Pkg.ResolvableProperties("", :product, "") + products.select! do |product| + product["status"] == :available && + new_repos.any?{|new_repo| product["source"] == new_repo["SrcId"]} + end + products.map!{|product| product["name"]} + + log.info "Products to install: #{products}" + + products.each do |product| + Pkg.ResolvableInstall(product, :product) + end + end + + private_class_method :each_repo end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/legacy_module_repositories.yml new/yast2-registration-3.1.109/test/fixtures/legacy_module_repositories.yml --- old/yast2-registration-3.1.108/test/fixtures/legacy_module_repositories.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/legacy_module_repositories.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,16 @@ +--- +- alias: Legacy_Module_12_x86_64:SLE-MODULE-LEGACY12-Pool + autorefresh: false + base_urls: + - https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... + enabled: true + is_update_repo: false + keeppackages: false + mirror_list: '' + name: SLE-MODULE-LEGACY12-Pool + priority: 99 + product_dir: '' + service: Legacy_Module_12_x86_64 + type: YUM + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... + SrcId: 5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/legacy_module_services.yml new/yast2-registration-3.1.109/test/fixtures/legacy_module_services.yml --- old/yast2-registration-3.1.108/test/fixtures/legacy_module_services.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/legacy_module_services.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,41 @@ +--- +- !ruby/object:SUSE::Connect::Remote::Service + table: + :id: 1140 + :name: Legacy_Module_12_x86_64 + :url: https://scc.suse.com/access/services/1140?credentials=Legacy_Module_12_x86_6... + :product: !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1150 + :name: Legacy Module + :identifier: sle-module-legacy + :former_identifier: sle-module-legacy + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Legacy Module 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-module-legacy:12.0 + :free: true + :description: "<p> The Legacy Module supports your migration from SUSE Linux + Enterprise 10 and 11 and other systems to SUSE Linux Enterprise 12, by providing + packages which are discontinued on SUSE Linux Enterprise Server, but which + you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail, IBM + Java6. </p> <p> Access to the Legacy Module is included in your SUSE Linux + Enterprise Server subscription. The module has a different lifecycle than + SUSE Linux Enterprise Server itself; please check the Release Notes for + further details. </p>" + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... + :enabled_repositories: + - 1491 + :extensions: [] + :repositories: + - id: 1491 + name: SLE-MODULE-LEGACY12-Pool + distro_target: sle-12-x86_64 + description: SLE-MODULE-LEGACY12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-legac... + enabled: true + autorefresh: false + modifiable: true + modifiable: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/fixtures/products_legacy_installation.yml new/yast2-registration-3.1.109/test/fixtures/products_legacy_installation.yml --- old/yast2-registration-3.1.108/test/fixtures/products_legacy_installation.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.109/test/fixtures/products_legacy_installation.yml 2014-08-25 11:14:34.000000000 +0200 @@ -0,0 +1,108 @@ +--- +- arch: x86_64 + category: addon + description: "<p>\n The Legacy Module supports your migration from SUSE Linux + Enterprise 10\n and 11 and other systems to SUSE Linux Enterprise 12, by + providing\n packages which are discontinued on SUSE Linux Enterprise Server, + but\n which you may rely on, such as: CyrusIMAP, BSD like ftp client, sendmail,\n + \ IBM Java6.\n\t</p>\n\t<p>\n Access to the Legacy Module is included + in your SUSE Linux Enterprise\n Server subscription. The module has a different + lifecycle than SUSE Linux\n Enterprise Server itself; please check the Release + Notes for further\n details.\n\t</p>" + display_name: Legacy Module + download_size: 0 + eol: 1420070400 + flags: [] + flavor: POOL + inst_size: 0 + locked: false + medium_nr: 0 + name: sle-module-legacy + product_file: sle-module-legacy.prod + product_package: sle-module-legacy-release + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: '' + short_name: Legacy-module + source: 5 + status: :available + summary: Legacy Module + transact_by: :solver + type: addon + update_urls: [] + vendor: SUSE LLC <https://www.suse.com/> + version: 12-0 +- arch: x86_64 + category: base + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + display_name: SUSE Linux Enterprise Server 12 + download_size: 0 + eol: 1420070400 + flags: [] + flavor: DVD + inst_size: 0 + locked: false + medium_nr: 0 + name: SLES + product_file: "/etc/products.d/SLES.prod" + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + relnotes_urls: + - https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + short_name: SLES12 + source: -1 + status: :installed + summary: SUSE Linux Enterprise Server 12 + transact_by: :solver + type: base + update_urls: [] + upgrades: [] + vendor: SUSE + version: 12-0 +- arch: x86_64 + category: addon + description: |- + SUSE Linux Enterprise offers a comprehensive + suite of products built on a single code base. + The platform addresses business needs from + the smallest thin-client devices to the world's + most powerful high-performance computing + and mainframe servers. SUSE Linux Enterprise + offers common management tools and technology + certifications across the platform, and + each product is enterprise-class. + display_name: SUSE Linux Enterprise Server 12 (RC2) + download_size: 0 + eol: 1420070400 + flags: [] + flavor: DVD + inst_size: 0 + locked: false + medium_nr: 0 + name: SLES + product_file: SLES.prod + product_package: sles-release + register_release: '' + register_target: sle-12-x86_64 + relnotes_url: https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + relnotes_urls: + - https://www.suse.com/releasenotes/x86_64/SUSE-SLES/12/release-notes-sles.rpm + short_name: SLES12 + source: 3 + status: :available + summary: SUSE Linux Enterprise Server 12 (RC2) + transact_by: :solver + type: addon + update_urls: [] + vendor: SUSE LLC <https://www.suse.com/> + version: 12-0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.108/test/sw_mgmt_spec.rb new/yast2-registration-3.1.109/test/sw_mgmt_spec.rb --- old/yast2-registration-3.1.108/test/sw_mgmt_spec.rb 2014-08-22 11:29:47.000000000 +0200 +++ new/yast2-registration-3.1.109/test/sw_mgmt_spec.rb 2014-08-25 11:14:35.000000000 +0200 @@ -4,6 +4,7 @@ require_relative "yast_stubs" require "suse/connect" +require "yaml" describe "Registration::SwMgmt" do let(:yast_pkg) { double("Yast::Pkg") } @@ -190,4 +191,20 @@ end end + describe ".select_addon_products" do + it "selects new addon products for installation" do + legacy_services = YAML.load_file(fixtures_file("legacy_module_services.yml")) + + expect(::Registration::Storage::Cache).to receive(:instance). + and_return(double("addon_services" => legacy_services)) + expect(::Registration::SwMgmt).to receive(:service_repos).with(legacy_services.first). + and_return(YAML.load_file(fixtures_file("legacy_module_repositories.yml"))) + expect(yast_pkg).to receive(:ResolvableProperties). + and_return(YAML.load_file(fixtures_file("products_legacy_installation.yml"))) + expect(yast_pkg).to receive(:ResolvableInstall).with("sle-module-legacy", :product) + + Registration::SwMgmt.select_addon_products + end + end + end continue with "q"... Checked in at Mon Aug 25 15:39:11 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org