Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 885638 : "Build0510: "registration failed" - without explanation" (RESOLVED/FIXED) ## BNC# 885633 : "Build0510: Can't cancel 'local registration servers'" (RESOLVED/FIXED) ## BNC# 885968 : "yast2 scc: trusted SSL certificate not copied from instsys to installed system" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-07-04 15:56:10.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-07-07 16:02:46.000000000 +0200 @@ -1,0 +2,28 @@ +Mon Jul 7 13:46:45 UTC 2014 - lslezak@suse.cz + +- better handle "Network unreachable" error (Errno::ENETUNREACH) + (bnc#885638) +- 3.1.88 + +------------------------------------------------------------------- +Mon Jul 7 13:09:34 UTC 2014 - lslezak@suse.cz + +- added "Cancel" button to SLP selection dialog to allow to change + the entered values before connecting to the server (bnc#885633) +- 3.1.87 + +------------------------------------------------------------------- +Mon Jul 7 11:03:17 UTC 2014 - lslezak@suse.cz + +- copy imported SMT certificate from inst-sys to the target system + (bnc#885968) +- 3.1.86 + +------------------------------------------------------------------- +Fri Jul 4 15:37:14 UTC 2014 - lslezak@suse.cz + +- pass product renames to AddOnProduct module to update the + default fallback mapping +- 3.1.85 + +------------------------------------------------------------------- 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:40843 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.84.tar.bz2 New: ---- yast2-registration-3.1.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.7NZJUP/_old 2014-07-07 16:12:07.000000000 +0200 +++ /var/tmp/diff_new_pack.7NZJUP/_new 2014-07-07 16:12:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.84 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,7 @@ Requires: rubygem-suse-connect >= 0.2.0 Requires: yast2-slp >= 3.1.2 Requires: yast2-add-on >= 3.1.8 -Requires: yast2-packager >= 3.1.22 +Requires: yast2-packager >= 3.1.26 BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files @@ -43,7 +43,7 @@ BuildRequires: rubygem-rspec BuildRequires: rubygem-suse-connect >= 0.2.0 BuildRequires: yast2-slp >= 3.1.2 -BuildRequires: yast2-packager >= 3.1.22 +BuildRequires: yast2-packager >= 3.1.26 BuildArch: noarch ++++++ yast2-registration-3.1.84.tar.bz2 -> yast2-registration-3.1.87.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/package/yast2-registration.changes new/yast2-registration-3.1.87/package/yast2-registration.changes --- old/yast2-registration-3.1.84/package/yast2-registration.changes 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/package/yast2-registration.changes 2014-07-07 16:00:34.000000000 +0200 @@ -1,4 +1,32 @@ ------------------------------------------------------------------- +Mon Jul 7 13:46:45 UTC 2014 - lslezak@suse.cz + +- better handle "Network unreachable" error (Errno::ENETUNREACH) + (bnc#885638) +- 3.1.88 + +------------------------------------------------------------------- +Mon Jul 7 13:09:34 UTC 2014 - lslezak@suse.cz + +- added "Cancel" button to SLP selection dialog to allow to change + the entered values before connecting to the server (bnc#885633) +- 3.1.87 + +------------------------------------------------------------------- +Mon Jul 7 11:03:17 UTC 2014 - lslezak@suse.cz + +- copy imported SMT certificate from inst-sys to the target system + (bnc#885968) +- 3.1.86 + +------------------------------------------------------------------- +Fri Jul 4 15:37:14 UTC 2014 - lslezak@suse.cz + +- pass product renames to AddOnProduct module to update the + default fallback mapping +- 3.1.85 + +------------------------------------------------------------------- Fri Jul 4 07:55:33 UTC 2014 - lslezak@suse.cz - check also the previous product name to handle addon/extension diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/package/yast2-registration.spec new/yast2-registration-3.1.87/package/yast2-registration.spec --- old/yast2-registration-3.1.84/package/yast2-registration.spec 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/package/yast2-registration.spec 2014-07-07 16:00:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.84 +Version: 3.1.87 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,7 @@ Requires: rubygem-suse-connect >= 0.2.0 Requires: yast2-slp >= 3.1.2 Requires: yast2-add-on >= 3.1.8 -Requires: yast2-packager >= 3.1.22 +Requires: yast2-packager >= 3.1.26 BuildRequires: yast2 >= 3.1.26 BuildRequires: update-desktop-files @@ -43,7 +43,7 @@ BuildRequires: rubygem-rspec BuildRequires: rubygem-suse-connect >= 0.2.0 BuildRequires: yast2-slp >= 3.1.2 -BuildRequires: yast2-packager >= 3.1.22 +BuildRequires: yast2-packager >= 3.1.26 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/clients/discover_registration_services.rb new/yast2-registration-3.1.87/src/clients/discover_registration_services.rb --- old/yast2-registration-3.1.84/src/clients/discover_registration_services.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/clients/discover_registration_services.rb 2014-07-07 16:00:34.000000000 +0200 @@ -46,7 +46,8 @@ ), VSpacing(Opt(:vstretch), 1), ButtonBox( - PushButton(Id(:ok), Opt(:default), Label.OKButton) + PushButton(Id(:ok), Opt(:default), Label.OKButton), + PushButton(Id(:cancel), Label.CancelButton) ) ) ) @@ -74,7 +75,7 @@ return url when :cancel - break + return :cancel end end ensure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/clients/inst_scc.rb new/yast2-registration-3.1.87/src/clients/inst_scc.rb --- old/yast2-registration-3.1.84/src/clients/inst_scc.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/clients/inst_scc.rb 2014-07-07 16:00:34.000000000 +0200 @@ -136,7 +136,7 @@ # reset the user input in case an exception is raised ret = nil - init_registration + next if init_registration == :cancel success = ::Registration::SccHelpers.catch_registration_errors do base_product = ::Registration::SwMgmt.find_base_product @@ -714,6 +714,7 @@ def init_registration if !@registration url = ::Registration::Helpers.registration_url + return :cancel if url == :cancel @registration = ::Registration::Registration.new(url) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/clients/scc_auto.rb new/yast2-registration-3.1.87/src/clients/scc_auto.rb --- old/yast2-registration-3.1.84/src/clients/scc_auto.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/clients/scc_auto.rb 2014-07-07 16:00:34.000000000 +0200 @@ -211,6 +211,9 @@ if Mode.normal || Mode.config # popup message: registration finished properly Popup.Message(_("Registration was successfull.")) + else + # copy the SSL certificate to the target system + ::Registration::Helpers.copy_certificate_to_target end return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/lib/registration/connect_helpers.rb new/yast2-registration-3.1.87/src/lib/registration/connect_helpers.rb --- old/yast2-registration-3.1.84/src/lib/registration/connect_helpers.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/lib/registration/connect_helpers.rb 2014-07-07 16:00:34.000000000 +0200 @@ -58,7 +58,8 @@ yield true - rescue SocketError + rescue SocketError, Errno::ENETUNREACH => e + log.error "Network error: #{e.class}: #{e.message}" # Error popup if Yast::Mode.installation || Yast::Mode.update if Yast::Popup.YesNo( @@ -122,7 +123,7 @@ false rescue Exception => e - log.error("SCC registration failed: #{e}, #{e.backtrace}") + log.error("SCC registration failed: #{e.class}: #{e}, #{e.backtrace}") Yast::Report.Error(_("Registration failed.")) false end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/lib/registration/finish_dialog.rb new/yast2-registration-3.1.87/src/lib/registration/finish_dialog.rb --- old/yast2-registration-3.1.84/src/lib/registration/finish_dialog.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/lib/registration/finish_dialog.rb 2014-07-07 16:00:34.000000000 +0200 @@ -57,6 +57,8 @@ Yast::WFM.Execute(Yast::Path.new(".local.bash"), "mv '#{source_path}' '#{target_path}'") + # copy the imported SSL certificate + Helpers.copy_certificate_to_target nil else raise "Uknown action #{func} passed as first parameter" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/lib/registration/helpers.rb new/yast2-registration-3.1.87/src/lib/registration/helpers.rb --- old/yast2-registration-3.1.84/src/lib/registration/helpers.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/lib/registration/helpers.rb 2014-07-07 16:00:34.000000000 +0200 @@ -94,6 +94,9 @@ nil end + # SLP selection canceled, do not cache it + return url if url == :cancel + # cache the URL ::Registration::Storage::Cache.instance.reg_url = url ::Registration::Storage::Cache.instance.reg_url_cached = true @@ -262,5 +265,22 @@ attr_list[1] end + # copy the imported SSL certificate to the target system (if exists) + def self.copy_certificate_to_target + cert_file = SUSE::Connect::SSLCertificate::SERVER_CERT_FILE + # any certificate imported? + if File.exist?(cert_file) + # copy the imported certificate + log.info "Copying SSL certificate (#{cert_file}) to the target system..." + cert_target_file = File.join(Yast::Installation.destdir, cert_file) + ::FileUtils.mkdir_p(File.dirname(cert_target_file)) + ::FileUtils.cp(cert_file, cert_target_file) + + # update the certificate links + cmd = SUSE::Connect::SSLCertificate::UPDATE_CERTIFICATES + log.info "Updating certificate links (#{cmd})..." + Yast::SCR.Execute(Yast::Path.new(".target.bash"), cmd) + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/lib/registration/registration.rb new/yast2-registration-3.1.87/src/lib/registration/registration.rb --- old/yast2-registration-3.1.84/src/lib/registration/registration.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/lib/registration/registration.rb 2014-07-07 16:00:34.000000000 +0200 @@ -95,6 +95,9 @@ addons = SUSE::Connect::YaST.show_product(remote_product, params).extensions || [] log.info "Available addons result: #{addons}" + renames = collect_renames(addons) + ::Registration::SwMgmt.update_product_renames(renames) + # ignore the base product "addon" addons.reject{ |a| a.identifier == base_product["name"] } end @@ -173,5 +176,19 @@ default_params.merge(params) end + + def collect_renames(addons) + renames = {} + + addons.each do |addon| + if addon.former_identifier && addon.identifier != addon.former_identifier + renames[addon.former_identifier] = addon.identifier + end + end + + log.info "Collected product renames: #{renames}" + + renames + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.87/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-3.1.84/src/lib/registration/sw_mgmt.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/src/lib/registration/sw_mgmt.rb 2014-07-07 16:00:34.000000000 +0200 @@ -30,6 +30,7 @@ require "registration/helpers" module Registration + Yast.import "AddOnProduct" Yast.import "Mode" Yast.import "Pkg" Yast.import "PackageLock" @@ -296,6 +297,13 @@ ret end + # update the static defaults in AddOnProduct module + def self.update_product_renames(renames) + renames.each do |old_name, new_name| + AddOnProduct.add_rename(old_name, new_name) + end + end + # a helper method for iterating over repositories # @param repo_aliases [Array<String>] list of repository aliases # @param block block evaluated for each found repository diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/test/fixtures/remote_product.yml new/yast2-registration-3.1.87/test/fixtures/remote_product.yml --- old/yast2-registration-3.1.84/test/fixtures/remote_product.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.87/test/fixtures/remote_product.yml 2014-07-07 16:00:34.000000000 +0200 @@ -0,0 +1,336 @@ +--- !ruby/object:SUSE::Connect::Remote::Product +table: + :id: 1117 + :name: SUSE Linux Enterprise Server + :identifier: SLES + :former_identifier: SLES + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Server 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sles:12.0 + :free: false + :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. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-Server-POOL-... + :enabled_repositories: + - 1219 + - 1478 + :extensions: + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1222 + :name: SUSE Linux Enterprise Workstation Extension + :identifier: sle-we + :former_identifier: sle-we + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Workstation Extension 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-we:12.0 + :free: true + :description: SUSE Linux Enterprise Workstation Extension extends the functionality + of SUSE Linux Enterprise Server with packages of SUSE Linux Enterprise Desktop, + like additional desktop applications (office suite, email client, graphical + editor ...) and libraries. It allows to combine both products to create a + full featured Workstation. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_... + :enabled_repositories: + - 1468 + - 1485 + :extensions: [] + :repositories: + - id: 1469 + name: SLE-WE12-Debuginfo-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Debuginfo-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard_debug + enabled: false + autorefresh: true + - id: 1485 + name: SLE-WE12-Pool + distro_target: sle-12-x86_64 + description: SLE-WE12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-WE-POOL-x86_... + enabled: true + autorefresh: false + - id: 1468 + name: SLE-WE12-Updates + distro_target: sle-12-x86_64 + description: SLE-WE12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-WE:/12:/x86_64/standard + enabled: true + autorefresh: true + modifiable: true + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1223 + :name: SUSE Linux Enterprise Software Development Kit + :identifier: sle-sdk + :former_identifier: sle-sdk + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise Software Development Kit 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-sdk:12.0 + :free: true + :description: "<p> SUSE Linux Enterprise Software Development Kit 12 is the + Software Development Kit for the family of SUSE Linux Enterprise products. + It is a free of charge extension for partners and customers working with SUSE + Linux Enterprise Server and Desktop and derived products. </p> <p> Packages + on the SDK are delivered without L3 support; maintenance updates will be done + for critical security and critical non-security issues, and where needed to + remain in sync with packages delivered in the SUSE Linux Enterprise Server + and Desktop products. </p> <p> Packages to rebuild SUSE Linux Enterprise Server + are not part of the SUSE Linux Enterprise Software Development Kit. </p>" + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86... + :enabled_repositories: + - 1232 + - 1488 + :extensions: [] + :repositories: + - id: 1488 + name: SLE-SDK12-Pool + distro_target: sle-12-x86_64 + description: SLE-SDK12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-SDK-POOL-x86... + enabled: true + autorefresh: false + - id: 1232 + name: SLE-SDK12-Updates + distro_target: sle-12-x86_64 + description: SLE-SDK12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-SDK:/12:/x86_64/standard + enabled: true + autorefresh: true + modifiable: true + - !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: '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. 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.' + :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 + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1153 + :name: Web and Scripting Module + :identifier: sle-module-web-scripting + :former_identifier: sle-module-web-scripting + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Web and Scripting Module 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-module-web-scripting:12.0 + :free: true + :description: 'The SUSE Linux Enterprise Web and Scripting Module delivers a + comprehensive suite of scripting languages, frameworks, and related tools + helping developers and systems administrators accelerate the creation of stable, + modern web applications, including: PHP, Ruby on Rails, Python version 3. + Access to the Web and Scripting 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.' + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-s... + :enabled_repositories: + - 1494 + :extensions: [] + :repositories: + - id: 1494 + name: SLE-MODULE-WEB-SCRIPTING12-Pool + distro_target: sle-12-x86_64 + description: SLE-MODULE-WEB-SCRIPTING12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-web-s... + enabled: true + autorefresh: false + modifiable: true + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1220 + :name: Public Cloud Module + :identifier: sle-module-public-cloud + :former_identifier: sle-module-public-cloud + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Public Cloud Module 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-module-public-cloud:12.0 + :free: true + :description: The Public Cloud Module is a collection of tools that enables + you to create and manage cloud images from the commandline on SUSE Linux Enterprise + Server. When building your own images with KIWI or SUSE Studio, initialization + code specific to the target cloud is included in that image. Access to the + Public Cloud 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. + :eula_url: + :enabled_repositories: + - 1497 + :extensions: [] + :repositories: + - id: 1497 + name: SLE-MODULE-PUBLIC-CLOUD12-Pool + distro_target: sle-12-x86_64 + description: SLE-MODULE-PUBLIC-CLOUD12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-publi... + enabled: true + autorefresh: false + modifiable: true + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1212 + :name: Advanced Systems Management Module + :identifier: sle-module-adv-systems-management + :former_identifier: sle-module-adv-systems-management + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: Advanced Systems Management Module 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-module-adv-systems-management:12.0 + :free: true + :description: This Module gives you a sneak-peak into our upcoming systems management + toolbox which allows you to inspect systems remotely, store their system description + and create new systems to deploy them in datacenters and clouds. The toolbox + is still in active development and will get regular updates. We welcome feedback! + :eula_url: + :enabled_repositories: + - 1498 + :extensions: [] + :repositories: + - id: 1498 + name: SLE-MODULE-ADV-SYSTEMS-MANAGEMENT12-Pool + distro_target: sle-12-x86_64 + description: SLE-MODULE-ADV-SYSTEMS-MANAGEMENT12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-module-adv-s... + enabled: true + autorefresh: false + modifiable: true + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1155 + :name: SUSE Linux Enterprise High Availability Extension + :identifier: sle-hae + :former_identifier: sle-hae + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise High Availability Extension 12 x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-hae:12.0 + :free: false + :description: SUSE Linux Enterprise High Availability Extension. + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_... + :enabled_repositories: + - 1242 + - 1500 + :extensions: + - !ruby/object:SUSE::Connect::Remote::Product + table: + :id: 1157 + :name: SUSE Linux Enterprise High Availability GEO Extension + :identifier: sle-ha-geo + :former_identifier: sle-ha-geo + :version: '12' + :release_type: + :arch: x86_64 + :friendly_name: SUSE Linux Enterprise High Availability GEO Extension 12 + x86_64 + :product_class: + :cpe: cpe:/o:suse:sle-ha-geo:12.0 + :free: false + :description: SUSE Linux Enterprise High Availability Geographical Cluster + Extension + :eula_url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-GEO-POOL-... + :enabled_repositories: + - 1246 + - 1502 + :extensions: [] + :repositories: + - id: 1502 + name: SLE-HA-GEO12-Pool + distro_target: sle-12-x86_64 + description: SLE-HA-GEO12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-GEO-POOL-... + enabled: true + autorefresh: false + - id: 1246 + name: SLE-HA-GEO12-Updates + distro_target: sle-12-x86_64 + description: SLE-HA-GEO12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-HAE-GEO:/12:/x86_64/standard + enabled: true + autorefresh: true + modifiable: true + :repositories: + - id: 1500 + name: SLE-HAE12-Pool + distro_target: sle-12-x86_64 + description: SLE-HAE12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-HA-POOL-x86_... + enabled: true + autorefresh: false + - id: 1242 + name: SLE-HAE12-Updates + distro_target: sle-12-x86_64 + description: SLE-HAE12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-HAE:/12:/x86_64/standard + enabled: true + autorefresh: true + modifiable: true + :repositories: + - id: 1220 + name: SLES12-Debuginfo-Updates + distro_target: sle-12-x86_64 + description: SLES12-Debuginfo-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-SERVER:/12:/x86_64/standard_debug + enabled: false + autorefresh: true + - id: 1478 + name: SLES12-Pool + distro_target: sle-12-x86_64 + description: SLES12-Pool for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Products:/SLE-12/images/repo/SLE-12-Server-POOL-... + enabled: true + autorefresh: false + - id: 1219 + name: SLES12-Updates + distro_target: sle-12-x86_64 + description: SLES12-Updates for sle-12-x86_64 + url: https://nu.novell.com/SUSE:/Updates:/SLE-SERVER:/12:/x86_64/standard + enabled: true + autorefresh: true +modifiable: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/test/helpers_spec.rb new/yast2-registration-3.1.87/test/helpers_spec.rb --- old/yast2-registration-3.1.84/test/helpers_spec.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/test/helpers_spec.rb 2014-07-07 16:00:34.000000000 +0200 @@ -189,4 +189,33 @@ end end + describe ".copy_certificate_to_target" do + let(:yast_scr) { double("Yast::SCR") } + let(:yast_installation) { double("Yast::Installation") } + let(:cert_file) { SUSE::Connect::SSLCertificate::SERVER_CERT_FILE } + + before do + stub_const("Yast::SCR", yast_scr) + stub_const("Yast::Installation", yast_installation) + end + + it "does nothing when no SSL certificate has been imported" do + expect(File).to receive(:exist?).with(cert_file).and_return(false) + expect(FileUtils).to receive(:cp).never + + expect {Registration::Helpers.copy_certificate_to_target}.to_not raise_error + end + + it "copies the certificate and updates all certificate links" do + expect(File).to receive(:exist?).with(cert_file).and_return(true) + expect(yast_installation).to receive(:destdir).and_return("/mnt") + expect(FileUtils).to receive(:mkdir_p).with("/mnt" + File.dirname(cert_file)) + expect(FileUtils).to receive(:cp).with(cert_file, "/mnt" + cert_file) + expect(yast_scr).to receive(:Execute).with(Yast::Path.new(".target.bash"), + SUSE::Connect::SSLCertificate::UPDATE_CERTIFICATES) + + expect {Registration::Helpers.copy_certificate_to_target}.to_not raise_error + end + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/test/registration_spec.rb new/yast2-registration-3.1.87/test/registration_spec.rb --- old/yast2-registration-3.1.84/test/registration_spec.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/test/registration_spec.rb 2014-07-07 16:00:34.000000000 +0200 @@ -82,4 +82,33 @@ end end + describe "#get_addon_list" do + let(:base_product) do + { + "name" => "SLES", + "version" => "12", + "arch" => "x86_64", + "release_type" => "DVD" + } + end + before do + expect(Registration::SwMgmt).to receive(:base_product_to_register).and_return(base_product) + end + + it "downloads available extensions" do + remote_product = YAML.load_file(fixtures_file("remote_product.yml")) + expect(SUSE::Connect::YaST).to receive(:show_product).and_return(remote_product) + # no product renames defined + expect(Registration::SwMgmt).to receive(:update_product_renames).with({}) + + addons = Registration::Registration.new.get_addon_list + + # HA-GEO is extension for HA so it's not included in the list + # also the base product must not be included in the list + expect(addons.map(&:identifier)).to include("sle-we", "sle-sdk", + "sle-module-legacy", "sle-module-web-scripting", "sle-module-public-cloud", + "sle-module-adv-systems-management", "sle-hae") + end + end + end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.84/test/yast_stubs.rb new/yast2-registration-3.1.87/test/yast_stubs.rb --- old/yast2-registration-3.1.84/test/yast_stubs.rb 2014-07-04 10:52:42.000000000 +0200 +++ new/yast2-registration-3.1.87/test/yast_stubs.rb 2014-07-07 16:00:34.000000000 +0200 @@ -28,6 +28,13 @@ def self.import(mod) true end + + # simply mock a Path as a String + class Path < String + def initialize(path) + super(path) + end + end end def stub_yast_require continue with "q"... Checked in at Mon Jul 7 16:12:24 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org