Schema change

.travis.yml

@@ -8,4 +8,4 @@ before_install:
 script:
   # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
   # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
-  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-geo-cluster-image yast-travis-ruby
+  - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-geo-cluster-image yast-travis-ruby

package/yast2-geo-cluster.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May  7 11:30:46 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+  (bsc#1170886)
+- 4.3.0
+
 -------------------------------------------------------------------
 Fri May 31 12:30:46 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
 

package/yast2-geo-cluster.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-geo-cluster
-Version:        4.2.1
+Version:        4.3.0
 Release:        0
 Summary:        Configuration of booth
 License:        GPL-2.0-only

src/autoyast-rnc/geo-cluster.rnc

@@ -2,23 +2,22 @@ default namespace = "http://www.suse.com/1.0/yast2ns"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace config = "http://www.suse.com/1.0/configns"
 
-# Refer to common.rnc in /usr/share/YaST2/schema/autoyast/rnc
-LIST = attribute config:type { "list" }
+include "common.rnc"
 
 geo-cluster =
   element geo-cluster {
       LIST,
       booth_config*
   }
 
-int_noempty = xsd:integer | empty
+int_noempty = STRING_ATTR, (xsd:integer | empty)
 
-filename = element filename { text }
-authfile = element authfile { text }
+filename = element filename { STRING }
+authfile = element authfile { STRING }
 port = element port { int_noempty }
-transport = element transport { text }
+transport = element transport { STRING }
 
-simple_listentry = element listentry { text }
+simple_listentry = element listentry { STRING }
 
 arbitrators =
   element arbitrator {
@@ -33,16 +32,18 @@ sites =
   }
 
 acquire-after = element acquire-after { int_noempty }
-before-acquire-handler = element before-acquire-handler { text }
+before-acquire-handler = element before-acquire-handler { STRING }
 expire = element expire { int_noempty }
 retries = element retries { int_noempty }
-ticketname = element ticketname { text }
+ticketname = element ticketname { STRING }
 timeout = element timeout { int_noempty }
 weights = element weights { int_noempty }
-mode = element mode { text }
+mode = element mode { STRING }
 
 ticket_listentry =
   element listentry {
+    MAP,
+    (
       acquire-after? &
       before-acquire-handler? &
       expire? &
@@ -51,6 +52,7 @@ ticket_listentry =
       timeout? &
       weights? &
       mode?
+    )
   }
 
 tickets =
@@ -61,13 +63,16 @@ tickets =
 
 booth_config =
   element listentry {
+    MAP,
+    (
       filename? &
       authfile? &
       port? &
       transport? &
       arbitrators? &
       sites? &
       tickets?
+    )
   }
 
 start = geo-cluster