correct some version in validation citeria

xcat2 · Jul 18, 2018 · ec4ee9d · ec4ee9d
1 parent dbaef18
commit ec4ee9d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/xcat-inventory/xcclient/inventory/schema/1.0/node.yaml b/xcat-inventory/xcclient/inventory/schema/1.0/node.yaml
@@ -1,7 +1,7 @@
 !!python/dict
   node:
     criteria:
-    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases <2.14, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14.3' else (True,'')}}"
+    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases <2.14, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14' else (True,'')}}"
     obj_type: 
     - "${{ groupname=T{nodegroup.groupname}, nodename=T{nodelist.node},objname=V{obj_name} :'node' if nodename == objname else 'group'}}"
     - "W:T{nodegroup.groupname}=${{objtype=V{obj_type},value=V{obj_name}: value if objtype=='group' else None}}"

diff --git a/xcat-inventory/xcclient/inventory/schema/1.0/osimage.yaml b/xcat-inventory/xcclient/inventory/schema/1.0/osimage.yaml
@@ -1,7 +1,7 @@
 !!python/dict
   osimage:
     criteria:
-    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases < 2.14.3, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14.3' else (True,'')}}"
+    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases < 2.14.2, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14.2' else (True,'')}}"
     imagetype:
     - "T{osimage.imagetype}"
     - "W:T{winimage.imagename}=${{imgtype=V{imagetype},value=V{obj_name} : value if imgtype == 'windows' else None }}"

diff --git a/xcat-inventory/xcclient/inventory/schema/1.0/site.yaml b/xcat-inventory/xcclient/inventory/schema/1.0/site.yaml
@@ -1,7 +1,7 @@
 !!python/dict  
   site:
     criteria:
-    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases <2.14.3, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14.3' else (True,'')}}"
+    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases <2.14.2, current xCAT version is %s'%(str(xcatversion))) if xcatversion>='2.14.2' else (True,'')}}"
     auditnosyslog: "T{site.auditnosyslog}"
     auditskipcmds: "T{site.auditskipcmds}"
     blademaxp: "T{site.blademaxp}"

diff --git a/xcat-inventory/xcclient/inventory/schema/3.0/osimage.yaml b/xcat-inventory/xcclient/inventory/schema/3.0/osimage.yaml
@@ -1,7 +1,7 @@
 !!python/dict
   osimage:
     criteria:
-    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases >=2.14.3, current xCAT version is %s'%(str(xcatversion))) if xcatversion<'2.14.3' else (True,'')}}"
+    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases >=2.14.2, current xCAT version is %s'%(str(xcatversion))) if xcatversion<'2.14.2' else (True,'')}}"
     imagetype:
     - "T{osimage.imagetype}"
     - "W:T{winimage.imagename}=${{imgtype=V{imagetype},value=V{obj_name} : value if imgtype == 'windows' else None }}"

diff --git a/xcat-inventory/xcclient/inventory/schema/3.0/site.yaml b/xcat-inventory/xcclient/inventory/schema/3.0/site.yaml
@@ -1,7 +1,7 @@
 !!python/dict  
   site:
     criteria:
-    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases >=2.4.3, current xCAT version is %s'%(str(xcatversion))) if xcatversion<'2.14.3' else (True,'')}}"
+    - "C:${{xcatversion=vutil.xcatversion(): (False,'This schema is valid for xCAT releases >=2.4.2, current xCAT version is %s'%(str(xcatversion))) if xcatversion<'2.14.2' else (True,'')}}"
     auditnosyslog: "T{site.auditnosyslog}"
     auditskipcmds: "T{site.auditskipcmds}"
     blademaxp: "T{site.blademaxp}"