- Other naming of ISO images and volume ids
This commit is contained in:
		
							parent
							
								
									a8734de548
								
							
						
					
					
						commit
						42175e5417
					
				| @ -2,13 +2,13 @@ | |||||||
|     "BaseOS": { |     "BaseOS": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [ |             "include_variants": [ | ||||||
|                 "AppStream" |                 "AppStream" | ||||||
|             ], |             ], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
| @ -79,12 +79,12 @@ | |||||||
|     }, |     }, | ||||||
|     "Minimal": { |     "Minimal": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [], |             "include_variants": [], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
|  | |||||||
| @ -2,13 +2,13 @@ | |||||||
|     "BaseOS": { |     "BaseOS": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [ |             "include_variants": [ | ||||||
|                 "AppStream" |                 "AppStream" | ||||||
|             ], |             ], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
| @ -79,12 +79,12 @@ | |||||||
|     }, |     }, | ||||||
|     "Minimal": { |     "Minimal": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [], |             "include_variants": [], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
|  | |||||||
| @ -143,7 +143,7 @@ image_name_format = { | |||||||
|     "^{{ variant }}$": "{{ options['image_name_format'] }}", |     "^{{ variant }}$": "{{ options['image_name_format'] }}", | ||||||
|         {% endif %} |         {% endif %} | ||||||
|     {% endfor %} |     {% endfor %} | ||||||
|     ".*": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |     ".*": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| image_volid_formats = [ | image_volid_formats = [ | ||||||
|  | |||||||
| @ -2,13 +2,13 @@ | |||||||
|     "BaseOS": { |     "BaseOS": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [ |             "include_variants": [ | ||||||
|                 "AppStream" |                 "AppStream" | ||||||
|             ], |             ], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
| @ -79,12 +79,12 @@ | |||||||
|     }, |     }, | ||||||
|     "Minimal": { |     "Minimal": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [], |             "include_variants": [], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
|  | |||||||
| @ -2,13 +2,13 @@ | |||||||
|     "BaseOS": { |     "BaseOS": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [ |             "include_variants": [ | ||||||
|                 "AppStream" |                 "AppStream" | ||||||
|             ], |             ], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
| @ -97,12 +97,12 @@ | |||||||
|     }, |     }, | ||||||
|     "Minimal": { |     "Minimal": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [], |             "include_variants": [], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
|  | |||||||
| @ -2,13 +2,13 @@ | |||||||
|     "BaseOS": { |     "BaseOS": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [ |             "include_variants": [ | ||||||
|                 "AppStream" |                 "AppStream" | ||||||
|             ], |             ], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
| @ -97,12 +97,12 @@ | |||||||
|     }, |     }, | ||||||
|     "Minimal": { |     "Minimal": { | ||||||
|         "gather_methods": "hybrid", |         "gather_methods": "hybrid", | ||||||
|         "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |         "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|         "buildinstall_skip": false, |         "buildinstall_skip": false, | ||||||
|         "createiso_skip": true, |         "createiso_skip": true, | ||||||
|         "extra_isos": [{ |         "extra_isos": [{ | ||||||
|             "include_variants": [], |             "include_variants": [], | ||||||
|             "filename": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", |             "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", | ||||||
|             "skip_src": true, |             "skip_src": true, | ||||||
|             "extra_files": [{ |             "extra_files": [{ | ||||||
|                 "scm": "git", |                 "scm": "git", | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user