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# 884937 : "Services added by the registration module have autorefresh disabled by default" (RESOLVED/FIXED)
## BNC# 871141 : "Undecided upgrade workflow, esp. registration upgrade" (RESOLVED/FIXED)
## BNC# 880649 : "Download module license failed during installation" (VERIFIED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-06-25 17:44:55.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-07-01 10:04:11.000000000 +0200
@@ -1,0 +2,20 @@
+Mon Jun 30 11:36:46 UTC 2014 - lslezak@suse.cz
+
+- enable autorefresh for registered services (bnc#884937)
+- 3.1.81
+
+-------------------------------------------------------------------
+Thu Jun 26 17:59:09 UTC 2014 - lslezak@suse.cz
+
+- update: automatically update installed addons (using simple
+ product name match so far) (bnc#871141)
+- 3.1.80
+
+-------------------------------------------------------------------
+Thu Jun 26 10:34:02 UTC 2014 - lslezak@suse.cz
+
+- removed workaround for failed EULA download (now do not allow to
+ continue when download fails) (bnc#880649)
+- 3.1.79
+
+-------------------------------------------------------------------
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:40237 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-registration-3.1.78.tar.bz2
New:
----
yast2-registration-3.1.81.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.Teh4BE/_old 2014-07-01 13:11:29.000000000 +0200
+++ /var/tmp/diff_new_pack.Teh4BE/_new 2014-07-01 13:11:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.78
+Version: 3.1.81
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-registration-3.1.78.tar.bz2 -> yast2-registration-3.1.81.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/.travis.yml new/yast2-registration-3.1.81/.travis.yml
--- old/yast2-registration-3.1.78/.travis.yml 2014-06-25 11:51:02.000000000 +0200
+++ new/yast2-registration-3.1.81/.travis.yml 2014-07-01 10:00:10.000000000 +0200
@@ -1,8 +1,4 @@
language: ruby
rvm:
- "2.1.0"
- - "2.0.0"
-matrix:
- allow_failures:
- - rvm: "2.1.0"
script: bundle exec rake -f Rakefile.travis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/README.md new/yast2-registration-3.1.81/README.md
--- old/yast2-registration-3.1.78/README.md 2014-06-25 11:51:02.000000000 +0200
+++ new/yast2-registration-3.1.81/README.md 2014-07-01 10:00:10.000000000 +0200
@@ -10,3 +10,22 @@
This is a YaST module for registering the system against [SUSE Customer Center](https://scc.suse.com)
+Example Snippet for Autoyast registration
+-----------------------------------------
+```
+
+ true
+ https://mysmt
+ text of our own certificate
+ <email>jreidinger@suse.com</email>
+ <regcode>my secret SLES regcode</regcode>
+ true
+ false
+ <addons>
+ <addon>
+ <name>addon name</name>
+ <regcode>addon regcode</regcode>
+ </addon>
+ </addons>
+
+```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/package/yast2-registration.changes new/yast2-registration-3.1.81/package/yast2-registration.changes
--- old/yast2-registration-3.1.78/package/yast2-registration.changes 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/package/yast2-registration.changes 2014-07-01 10:00:11.000000000 +0200
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Mon Jun 30 11:36:46 UTC 2014 - lslezak@suse.cz
+
+- enable autorefresh for registered services (bnc#884937)
+- 3.1.81
+
+-------------------------------------------------------------------
+Thu Jun 26 17:59:09 UTC 2014 - lslezak@suse.cz
+
+- update: automatically update installed addons (using simple
+ product name match so far) (bnc#871141)
+- 3.1.80
+
+-------------------------------------------------------------------
+Thu Jun 26 10:34:02 UTC 2014 - lslezak@suse.cz
+
+- removed workaround for failed EULA download (now do not allow to
+ continue when download fails) (bnc#880649)
+- 3.1.79
+
+-------------------------------------------------------------------
Wed Jun 25 09:37:12 UTC 2014 - jreidinger@suse.com
- add reading of old url from suseRegister.conf during upgrade
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/package/yast2-registration.spec new/yast2-registration-3.1.81/package/yast2-registration.spec
--- old/yast2-registration-3.1.78/package/yast2-registration.spec 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/package/yast2-registration.spec 2014-07-01 10:00:11.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 3.1.78
+Version: 3.1.81
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/src/clients/inst_scc.rb new/yast2-registration-3.1.81/src/clients/inst_scc.rb
--- old/yast2-registration-3.1.78/src/clients/inst_scc.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/src/clients/inst_scc.rb 2014-07-01 10:00:11.000000000 +0200
@@ -191,6 +191,9 @@
end
def refresh_base_product
+ options = ::Registration::Storage::InstallationOptions.instance
+ return true if options.base_registered
+
init_registration
::Registration::SccHelpers.catch_registration_errors do
@@ -198,16 +201,53 @@
base_product = ::Registration::SwMgmt.base_product_to_register
product_services = Popup.Feedback(
_(CONTACTING_MESSAGE),
- _("Registering %s ...") % ::Registration::SwMgmt.base_product_label(base_product)
+ # updating base product registration, %s is a new base product name
+ _("Updating to %s ...") % ::Registration::SwMgmt.base_product_label(
+ ::Registration::SwMgmt.find_base_product)
) do
@registration.upgrade_product(base_product)
end
+ options.base_registered = true
+
# select repositories to use in installation (e.g. enable/disable Updates)
select_repositories(product_services)
end
end
+ def refresh_addons
+ addons = get_available_addons
+
+ # find addon updates
+ addons_to_update = ::Registration::SwMgmt.find_addon_updates(addons)
+
+ failed_addons = addons_to_update.reject do |addon_to_update|
+ ::Registration::SccHelpers.catch_registration_errors do
+ # then register the product(s)
+ product_services = Popup.Feedback(
+ _(CONTACTING_MESSAGE),
+ # updating registered addon/extension, %s is an extension name
+ _("Updating to %s ...") % addon_to_update.label
+ ) do
+ @registration.upgrade_product(addon_to_update)
+ end
+
+ # mark as registered
+ addon_to_update.registered
+
+ select_repositories(product_services)
+ end
+ end
+
+ if !failed_addons.empty?
+ log.warn "Failed addons: #{failed_addons}"
+ # if update fails preselest the addon for full registration
+ failed_addons.each(&:selected)
+ end
+
+ :next
+ end
+
# display the registration update dialog
def show_registration_update_dialog
Wizard.SetContents(
@@ -224,7 +264,7 @@
show_registration_update_dialog
if refresh_base_product
- return :next
+ return refresh_addons
else
# automatic registration refresh during system upgrade failed, register from scratch
Report.Error(_("Automatic registration upgrade failed.\n" +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/src/lib/registration/addon.rb new/yast2-registration-3.1.81/src/lib/registration/addon.rb
--- old/yast2-registration-3.1.78/src/lib/registration/addon.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/src/lib/registration/addon.rb 2014-07-01 10:00:11.000000000 +0200
@@ -129,5 +129,9 @@
@pure_addon.available != false
end
+ def updates_addon?(old_addon)
+ old_addon["name"] == identifier
+ end
+
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/src/lib/registration/registration.rb new/yast2-registration-3.1.81/src/lib/registration/registration.rb
--- old/yast2-registration-3.1.78/src/lib/registration/registration.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/src/lib/registration/registration.rb 2014-07-01 10:00:11.000000000 +0200
@@ -106,19 +106,22 @@
private
def service_for_product(product, &block)
- remote_product = SUSE::Connect::Remote::Product.new(
+ remote_product = product.is_a?(Hash) ?
+ SUSE::Connect::Remote::Product.new(
:arch => product["arch"],
:identifier => product["name"],
:version => product["version"],
:release_type => product["release_type"]
- )
+ ) : product
log.info "Using product: #{remote_product}"
params = connect_params({})
# use product specific reg. code (e.g. for addons)
- params[:token] = product["reg_code"] if product["reg_code"]
+ if (product.is_a?(Hash) && product["reg_code"])
+ params[:token] = product["reg_code"]
+ end
product_service = yield(remote_product, params)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.81/src/lib/registration/sw_mgmt.rb
--- old/yast2-registration-3.1.78/src/lib/registration/sw_mgmt.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/src/lib/registration/sw_mgmt.rb 2014-07-01 10:00:11.000000000 +0200
@@ -182,6 +182,11 @@
# error message
raise ::Registration::ServiceError.new(N_("Adding service '%s' failed."), service_name)
end
+
+ if !Pkg.ServiceSet(service_name, "autorefresh" => true)
+ # error message
+ raise ::Registration::ServiceError.new(N_("Updating service '%s' failed."), service_name)
+ end
end
# refresh works only for saved services
@@ -274,6 +279,23 @@
end
end
+ def self.find_addon_updates(addons)
+ products = Pkg.ResolvableProperties("", :product, "")
+
+ installed_addons = products.select do |product|
+ product["status"] == :installed && product["type"] != "base"
+ end
+
+ ret = addons.select do |addon|
+ installed_addons.any? do |installed_addon|
+ addon.updates_addon?(installed_addon)
+ end
+ end
+
+ log.info "Found addons to update: #{ret}"
+ ret
+ 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
@@ -293,7 +315,7 @@
end
end
end
-
+
private_class_method :each_repo
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/src/lib/registration/ui/addon_eula_dialog.rb new/yast2-registration-3.1.81/src/lib/registration/ui/addon_eula_dialog.rb
--- old/yast2-registration-3.1.78/src/lib/registration/ui/addon_eula_dialog.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/src/lib/registration/ui/addon_eula_dialog.rb 2014-07-01 10:00:11.000000000 +0200
@@ -3,9 +3,6 @@
require "registration/eula_downloader"
require "registration/helpers"
-# TODO FIXME: this is used in a workaround, remove before RC/GM!!
-require "tempfile"
-
module Registration
module UI
@@ -84,8 +81,7 @@
log.error "Download failed: #{e.message}: #{e.backtrace}"
# %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
Yast::Report.Error(_("Downloading the license for\n%s\nfailed.") % addon.label)
- #FIXME change for GA!!!
- return true
+ return false
end
id = "#{addon.label} extension EULA"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/test/fixtures/available_addons.yml new/yast2-registration-3.1.81/test/fixtures/available_addons.yml
--- old/yast2-registration-3.1.78/test/fixtures/available_addons.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-3.1.81/test/fixtures/available_addons.yml 2014-07-01 10:00:11.000000000 +0200
@@ -0,0 +1,302 @@
+---
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1222
+ :name: SUSE Linux Enterprise Workstation Extension
+ :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
+ children: []
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1223
+ :name: SUSE Linux Enterprise Software Development Kit
+ :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
+ children: []
+- &2 !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1155
+ :name: SUSE Linux Enterprise High Availability Extension
+ :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:
+ - &1 !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1157
+ :name: SUSE Linux Enterprise High Availability GEO Extension
+ :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
+ children:
+ - &3 !ruby/object:Registration::Addon
+ pure_addon: *1
+ children: []
+ depends_on: *2
+- *3
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1150
+ :name: Legacy Module
+ :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
+ children: []
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1212
+ :name: Advanced Systems Management Module
+ :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
+ children: []
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1153
+ :name: Web and Scripting Module
+ :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
+ children: []
+- !ruby/object:Registration::Addon
+ pure_addon: !ruby/object:SUSE::Connect::Remote::Product
+ table:
+ :id: 1220
+ :name: Public Cloud Module
+ :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
+ children: []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.78/test/fixtures/products_sp2_update.yml new/yast2-registration-3.1.81/test/fixtures/products_sp2_update.yml
--- old/yast2-registration-3.1.78/test/fixtures/products_sp2_update.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-3.1.81/test/fixtures/products_sp2_update.yml 2014-07-01 10:00:11.000000000 +0200
@@ -0,0 +1,132 @@
+---
+- 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 11 SP2
+ download_size: 0
+ flags: []
+ flavor: DVD
+ inst_size: 0
+ locked: false
+ medium_nr: 0
+ name: SUSE_SLES
+ product_file: /mnt/etc/products.d/SUSE_SLES.prod
+ register_release: ''
+ register_target: sle-11-x86_64
+ register_urls:
+ - http://register.novell.com/
+ relnotes_url: http://www.novell.com/linux/releasenotes/x86_64/SUSE-SLES/11-SP2/release-not...
+ relnotes_urls:
+ - http://www.novell.com/linux/releasenotes/x86_64/SUSE-SLES/11-SP2/release-not...
+ short_name: SLES11_SP2
+ smolt_urls:
+ - http://smolt.novell.com/register.pl
+ source: -1
+ status: :installed
+ summary: SUSE Linux Enterprise Server 11 SP2
+ transact_by: :solver
+ type: base
+ update_urls: []
+ upgrades: []
+ vendor: SUSE LINUX Products GmbH, Nuernberg, Germany
+ version: 11.2-1.513
+- arch: x86_64
+ category: addon
+ description: WebYaST for SLE-11-SP2
+ display_name: WebYaST for SLE-11-SP2
+ download_size: 0
+ flags: []
+ flavor: cd
+ inst_size: 0
+ locked: false
+ medium_nr: 0
+ name: sle-11-SP2-WebYaST
+ product_file: /mnt/etc/products.d/sle-11-SP2-WebYaST.prod
+ register_release: ''
+ register_target: sle-11-SP2-x86_64
+ relnotes_url: http://www.novell.com/linux/releasenotes/x86_64/SLE-WEBYAST/1.2/release-note...
+ relnotes_urls:
+ - http://www.novell.com/linux/releasenotes/x86_64/SLE-WEBYAST/1.2/release-note...
+ short_name: sle-11-SP2-WebYaST
+ source: -1
+ status: :installed
+ summary: WebYaST for SLE-11-SP2
+ transact_by: :solver
+ type: addon
+ update_urls: []
+ upgrades: []
+ vendor: SUSE LINUX Products GmbH, Nuernberg, Germany
+ version: 1.2-1.4
+- arch: x86_64
+ category: addon
+ description: This is the SUSE Linux Enterprise Software Development Kit
+ display_name: SUSE Linux Enterprise Software Development Kit 11 SP2
+ download_size: 0
+ flags: []
+ flavor: SDK
+ inst_size: 0
+ locked: false
+ medium_nr: 0
+ name: sle-sdk
+ product_file: /mnt/etc/products.d/sle-sdk.prod
+ register_release: ''
+ register_target: sle-11-x86_64
+ relnotes_url: ''
+ short_name: sle-sdk
+ source: -1
+ status: :installed
+ summary: SUSE Linux Enterprise Software Development Kit 11 SP2
+ transact_by: :solver
+ type: addon
+ update_urls: []
+ upgrades: []
+ vendor: SUSE LINUX Products GmbH, Nuernberg, Germany
+ version: 11.2-1.66
+- 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 (Beta9)
+ download_size: 0
+ eol: 1420070400
+ flags: []
+ flavor: DVD
+ inst_size: 0
+ license: "SUSE(R) End User License Agreement..."
+ license_confirmed: false
+ 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: 0
+ status: :selected
+ summary: SUSE Linux Enterprise Server 12 (Beta9)
+ transact_by: :app_high
+ 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.78/test/sw_mgmt_spec.rb new/yast2-registration-3.1.81/test/sw_mgmt_spec.rb
--- old/yast2-registration-3.1.78/test/sw_mgmt_spec.rb 2014-06-25 11:51:03.000000000 +0200
+++ new/yast2-registration-3.1.81/test/sw_mgmt_spec.rb 2014-07-01 10:00:11.000000000 +0200
@@ -118,6 +118,7 @@
it "it creates a new service if the service does not exist yet" do
expect(yast_pkg).to receive(:ServiceAliases).and_return([])
expect(yast_pkg).to receive(:ServiceAdd).with(service_name, service_url).and_return(true)
+ expect(yast_pkg).to receive(:ServiceSet).with(service_name, hash_including("autorefresh" => true)).and_return(true)
expect { Registration::SwMgmt.add_service(product_service, credentials) }.to_not raise_error
end
@@ -171,4 +172,20 @@
end
end
+ describe ".find_addon_updates" do
+ it "returns new available addons for installed addons" do
+ # installed: SLES11-SP2 + SLE11-SP2-SDK + SLE11-SP2-Webyast
+ expect(yast_pkg).to receive(:ResolvableProperties).with("", :product, "") \
+ .and_return(YAML.load_file(fixtures_file("products_sp2_update.yml")))
+ # available: SDK, HA, HA-GEO, ...
+ available_addons = YAML.load_file(fixtures_file("available_addons.yml"))
+
+ addon_updates = Registration::SwMgmt.find_addon_updates(available_addons)
+ # an update only for SDK addon is available
+ expect(addon_updates).to have(1).items
+ expect(addon_updates.first.label).to \
+ eq("SUSE Linux Enterprise Software Development Kit 12 x86_64")
+ end
+ end
+
end
continue with "q"...
Checked in at Tue Jul 1 13:11:45 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