Hello community, here is the log from the commit of package yomi-formula for openSUSE:Factory checked in at 2020-11-13 18:54:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yomi-formula (Old) and /work/SRC/openSUSE:Factory/.yomi-formula.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yomi-formula" Fri Nov 13 18:54:59 2020 rev:19 rq:847445 version:0.0.1+git.1604593202.a2c22bf Changes: -------- --- /work/SRC/openSUSE:Factory/yomi-formula/yomi-formula.changes 2020-10-15 13:48:39.201255525 +0200 +++ /work/SRC/openSUSE:Factory/.yomi-formula.new.24930/yomi-formula.changes 2020-11-13 18:55:15.941855335 +0100 @@ -1,0 +2,13 @@ +Tue Nov 10 10:04:08 UTC 2020 - Alberto Planas Dominguez <[email protected]> + +- Update to version 0.0.1+git.1604593202.a2c22bf: + * storage: hide mountpoint if no filesystem + * software: migrate repos as certs + * software: add verify parameter + * _grains: efi grains are in Salt now + * software: transfer current repository + * software: add repository options + * lvm: fix indentation + * partitioned: fix parted call and tests + +------------------------------------------------------------------- Old: ---- yomi-0.0.1+git.1601999695.6141130.obscpio New: ---- yomi-0.0.1+git.1604593202.a2c22bf.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yomi-formula.spec ++++++ --- /var/tmp/diff_new_pack.rFRXSh/_old 2020-11-13 18:55:17.905857518 +0100 +++ /var/tmp/diff_new_pack.rFRXSh/_new 2020-11-13 18:55:17.909857523 +0100 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas Name: yomi-formula -Version: 0.0.1+git.1601999695.6141130 +Version: 0.0.1+git.1604593202.a2c22bf Release: 0 Summary: Yomi - Yet one more installer License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.rFRXSh/_old 2020-11-13 18:55:17.957857577 +0100 +++ /var/tmp/diff_new_pack.rFRXSh/_new 2020-11-13 18:55:17.961857581 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/yomi.git</param> - <param name="changesrevision">614113073239d0419c219c49eaf8754da300eec8</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">a2c22bfa3d9f3db41f0cdcef42af731c981ea410</param></service></servicedata> \ No newline at end of file ++++++ yomi-0.0.1+git.1601999695.6141130.obscpio -> yomi-0.0.1+git.1604593202.a2c22bf.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/README.md new/yomi-0.0.1+git.1604593202.a2c22bf/README.md --- old/yomi-0.0.1+git.1601999695.6141130/README.md 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/README.md 2020-11-05 17:20:02.000000000 +0100 @@ -1116,17 +1116,70 @@ * `config`. Dictionary. Optional - Local configuration for the software section. + Local configuration for the software section. Except `minimal`, + `transfer`, and `verify` all the options can be overwritten in each + repository definition. * `minimal`: Boolean. Optional. Default: `no` Configure zypper to make a minimal installation, excluding recommended, documentation and multi-version packages. + * `transfer`: Boolean. Optional. Default: `no` + + Transfer the current repositories (maybe defined in the media + installation) into the installed system. If marked, this step will + be done early, so any future action could update or replace one of + the repositories. + + * `verify`: Boolean. Optional. Default: `yes` + + Verify the package key when installing. + + * `enabled`: Boolean. Optional. Default: `yes` + + If the repository is enabled, packages can be installed from + there. A disabled repository will not be removed. + + * `refresh`: Boolean. Optional. Default: `yes` + + Enable auto-refresh of the repository. + + * `gpgcheck`: Boolean. Optional. Default: `yes` + + Enable or disable the GPG check for the repositories. + + * `gpgautoimport`: Boolean. Optional. Default: `yes` + + If enabled, automatically trust and import public GPG key for the + repository. + + * `cache`: Boolean. Optional. Default: `no` + + If the cache is enabled, will keep the RPM packages. + * `repositories`. Dictionary. Optional - Each key of the dictionary will be the name under where this - repository is registered, and the key is the URL associated with it. + Each key of the dictionary will be the alias under where this + repository is registered, and the key, if is a string, the URL + associated with it. + + If the key is an dictionary, we can overwrite some of the default + configuration options set in the `config` section, with the + exception of `minimal`. There are some more elements that we can set + for the repository: + + * `url`: String. + + URL of the repository. + + * `name`: String. Optional + + Descriptive name for the repository. + + * `priority`: Integer. Optional. Default: `0` + + Set priority of the repository. * `packages`. Array. Optional @@ -1138,12 +1191,12 @@ generate by KIWI (or any other mechanism), that will be copied into the partition that have the root mount point assigned. This can be used to speed the installation process. - + Those images needs to contain only the file system and the data. If the image contains a boot loader or partition information, the image will fail during the resize operation. To validate if the image is suitable, a simple `file image.raw` will do. - + * `url`: String. URL of the image. As internally we are using curl to fetch the @@ -1160,15 +1213,15 @@ same URL given in the previous field. If the path contains an extension for a compression format, this will be replaced with the checksum type as a new extension. - - For example, if the URL is `http://example.com/image.xz`, the + + For example, if the URL is `http://example.com/image.xz`, the checksum type is `md5`, and no value is provided, the checksum will be expected at `http://example.com/image.md5`. - - But if the URL is something like `http://example.com/image.ext4`, + + But if the URL is something like `http://example.com/image.ext4`, the checksum will be expected in the URL `http://example.com/image.ext4.md5`. - + If the checksum type is provided, the value for the last image will be stored in the Salt cache, and will be used to decide if the image in the URL is different from the one already copied in the @@ -1182,6 +1235,9 @@ software: repositories: repo-oss: "http://download.opensuse.org/tumbleweed/repo/oss"; + update: + url: http://download.opensuse.org/update/tumbleweed/ + name: openSUSE Update packages: - patterns-base-base - kernel-default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/metadata/02-form-yomi-storage.yml new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/02-form-yomi-storage.yml --- old/yomi-0.0.1+git.1601999695.6141130/metadata/02-form-yomi-storage.yml 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/02-form-yomi-storage.yml 2020-11-05 17:20:02.000000000 +0100 @@ -276,6 +276,7 @@ mountpoint: $type: text $placeholder: / + $visibleIf: .filesystem != swap $help: Mount point of the partition fat: $name: FAT Type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/metadata/03-form-yomi-bootloader.yml new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/03-form-yomi-bootloader.yml --- old/yomi-0.0.1+git.1601999695.6141130/metadata/03-form-yomi-bootloader.yml 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/03-form-yomi-bootloader.yml 2020-11-05 17:20:02.000000000 +0100 @@ -8,6 +8,7 @@ device: $type: text $placeholder: /dev/sda + $required: yes $help: Device where the GRUB2 will be installed timeout: $type: number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/metadata/04-form-yomi-software.yml new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/04-form-yomi-software.yml --- old/yomi-0.0.1+git.1601999695.6141130/metadata/04-form-yomi-software.yml 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/metadata/04-form-yomi-software.yml 2020-11-05 17:20:02.000000000 +0100 @@ -13,20 +13,78 @@ $type: boolean $default: no $help: Exclude recommended, documentation and multi-version packages + transfer: + $type: boolean + $default: no + $help: Transfer the current repositories from the media + verify: + $type: boolean + $default: yes + $help: Verify the package key when installing + enabled: + $type: boolean + $default: yes + $help: Enable the repository + refresh: + $type: boolean + $default: yes + $help: Enable auto-refresh of the repository + gpgcheck: + $type: boolean + $default: yes + $help: Enable the GPG check for the repositories + # gpgautoimport: + # $type: boolean + # $default: yes + # $help: Automatically trust and import public GPG key + cache: + $type: boolean + $default: no + $help: Keep the RPM packages in the system repositories: $type: edit-group $minItems: 0 + $itemName: Repository ${i} $help: List of registered repositories $prototype: + $type: group $key: - $name: Repository Name + $name: Alias $type: text $placeholder: repo-oss - $help: Short name of the repository - $name: Repository URL - $type: url - $placeholder: http://download.opensuse.org/tumbleweed/repo/oss - $help: URL of the repository + $help: Short name or alias of the repository + url: + $type: url + $placeholder: http://download.opensuse.org/tumbleweed/repo/oss + $required: yes + $help: URL of the repository + name: + $type: text + $optional: yes + $help: Descriptive name for the repository + enabled: + $type: boolean + $default: yes + $help: Enable the repository + refresh: + $type: boolean + $default: yes + $help: Enable auto-refresh of the repository + priority: + $type: number + $help: Set priority of the repository + gpgcheck: + $type: boolean + $default: yes + $help: Enable the GPG check for the repositories + # gpgautoimport: + # $type: boolean + # $default: yes + # $help: Automatically trust and import public GPG key + cache: + $type: boolean + $default: no + $help: Keep the RPM packages in the system packages: $type: edit-group $minItems: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/pillar/installer.sls new/yomi-0.0.1+git.1604593202.a2c22bf/pillar/installer.sls --- old/yomi-0.0.1+git.1601999695.6141130/pillar/installer.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/pillar/installer.sls 2020-11-05 17:20:02.000000000 +0100 @@ -59,6 +59,9 @@ software: config: minimal: {{ 'yes' if mode in ('microos', 'kubic') else 'no' }} + enabled: yes + autorefresh: yes + gpgcheck: yes repositories: {% if mode == 'sles' %} SUSE_SLE-15_GA: "http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/"; @@ -66,7 +69,9 @@ {% elif arch == 'aarch64' %} repo-oss: "http://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/"; {% else %} - repo-oss: "http://download.opensuse.org/tumbleweed/repo/oss/"; + repo-oss: + url: "http://download.opensuse.org/tumbleweed/repo/oss/"; + name: openSUSE-Tumbleweed {% endif %} {% if mode == 'image' %} image: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/_grains/efi.py new/yomi-0.0.1+git.1604593202.a2c22bf/salt/_grains/efi.py --- old/yomi-0.0.1+git.1601999695.6141130/salt/_grains/efi.py 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/_grains/efi.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Author: Alberto Planas <[email protected]> -# -# Copyright 2019 SUSE LLC. -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -import glob -import os.path - - -def __secure_boot(): - """Detect if secure-boot is enabled.""" - enabled = False - sboot = glob.glob("/sys/firmware/efi/vars/SecureBoot-*/data") - if len(sboot) == 1: - enabled = open(sboot[0], "rb").read()[-1:] == b"\x01" - return enabled - - -def uefi(): - """Populate UEFI grains.""" - grains = { - "efi": os.path.exists("/sys/firmware/efi/systab"), - "efi-secure-boot": __secure_boot(), - } - - return grains diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/_states/partitioned.py new/yomi-0.0.1+git.1604593202.a2c22bf/salt/_states/partitioned.py --- old/yomi-0.0.1+git.1601999695.6141130/salt/_states/partitioned.py 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/_states/partitioned.py 2020-11-05 17:20:02.000000000 +0100 @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Author: Alberto Planas <[email protected]> # @@ -27,14 +26,11 @@ :depends: None :platform: Linux """ -from __future__ import absolute_import, print_function, unicode_literals import logging import re -from salt.exceptions import CommandExecutionError - import disk - +from salt.exceptions import CommandExecutionError log = logging.getLogger(__name__) @@ -71,8 +67,9 @@ """ label = {"dos": "msdos"}.get(label, label) - res = __salt__["cmd.run"](["parted", "-l", device]) - return "partition table: {}".format(label) in res.lower() + res = __salt__["cmd.run"](["parted", "--list", "--machine", "--script"]) + line = "".join((line for line in res.splitlines() if line.startswith(device))) + return ":{}:".format(label) in line def labeled(name, label): @@ -450,14 +447,10 @@ if partition_match: ret["result"] = True - ret["comment"].append( - "Partition {}{} already in place".format(device, number) - ) + ret["comment"].append("Partition {}{} already in place".format(device, number)) return ret elif partition_match is None: - ret["changes"]["new"] = "Partition {}{} will be created".format( - device, number - ) + ret["changes"]["new"] = "Partition {}{} will be created".format(device, number) elif partition_match is False: ret["comment"].append( "Partition {}{} cannot be replaced".format(device, number) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/bootloader/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/bootloader/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/bootloader/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/bootloader/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -3,6 +3,9 @@ {% set bootloader = pillar['bootloader'] %} {% set arch = {'aarch64': 'arm64'}.get(grains['cpuarch'], grains['cpuarch'])%} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('pkg', 'install_grub2') }} install_grub2: pkg.installed: @@ -18,7 +21,12 @@ {% endif %} {% endif %} - resolve_capabilities: yes + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/chroot/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/chroot/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/chroot/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/chroot/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -1,5 +1,8 @@ {% import 'macros.yml' as macros %} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('module', 'freeze_chroot') }} freeze_chroot: module.run: @@ -13,8 +16,13 @@ install_python3-base: pkg.installed: - name: python3-base - - no_recommends: yes - resolve_capabilities: yes + {% if software_config.get('minimal') %} + - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/services/salt-minion/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/services/salt-minion/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/services/salt-minion/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/services/salt-minion/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -1,10 +1,18 @@ {% import 'macros.yml' as macros %} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('pkg', 'install_salt-minion') }} install_salt-minion: pkg.installed: - name: salt-minion + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/software/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/software/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/software/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/software/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -3,14 +3,47 @@ {% set software = pillar['software'] %} {% set software_config = software.get('config', {}) %} -{% for name, repo in software.get('repositories', {}).items() %} -{{ macros.log('pkgrepo', 'add_repository_' ~ repo) }} -add_repository_{{ repo }}: +{% if software_config.get('transfer') %} +{{ macros.log('module', 'transfer_repositories') }} +migrate_repositories: + pkgrepo.migrated: + - name: /mnt + - keys: yes + + {% for cert_dir in ['/usr/share/pki/trust/anchors', '/usr/share/pki/trust/blacklist', + '/etc/pki/trust/anchors', '/etc/pki/trust/blacklist'] %} +migrate_{{ cert_dir }}: + module.run: + - file.copy: + - src: {{ cert_dir }} + - dst: /mnt{{ cert_dir }} + - recurse: yes + - remove_existing: yes + - unless: "[ -e /mnt{{ cert_dir }} ]" + {% endfor %} +{% endif %} + +{% for alias, repository in software.get('repositories', {}).items() %} + {% if repository is mapping %} + {% set url = repository['url'] %} + {% else %} + {% set url = repository %} + {% set repository = {} %} + {% endif %} +{{ macros.log('pkgrepo', 'add_repository_' ~ alias) }} +add_repository_{{ alias }}: pkgrepo.managed: - - name: {{ name }} - - baseurl: {{ repo }} - - refresh: yes - - gpgautoimport: yes + - baseurl: {{ url }} + - name: {{ alias }} + {% if repository.get('name') %} + - humanname: {{ repository.name }} + {% endif %} + - enabled: {{ repository.get('enabled', software_config.get('enabled', 'yes')) }} + - refresh: {{ repository.get('refresh', software_config.get('refresh', 'yes')) }} + - priority: {{ repository.get('priority', 0) }} + - gpgcheck: {{ repository.get('gpgcheck', software_config.get('gpgcheck', 'yes')) }} + - gpgautoimport: {{ repository.get('gpgautoimport', software_config.get('gpgautoimport', 'yes')) }} + - cache: {{ repository.get('cache', software_config.get('cache', 'no')) }} - root: /mnt - require: - mount: mount_/mnt @@ -32,7 +65,12 @@ install_packages: pkg.installed: - pkgs: {{ software.packages }} + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - includes: [product, pattern] - root: /mnt {% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/lvm/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/lvm/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/lvm/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/lvm/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -1,10 +1,18 @@ {% import 'macros.yml' as macros %} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('pkg', 'install_lvm2') }} install_lvm2: pkg.installed: - name: lvm2 + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/lvm/volume.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/lvm/volume.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/lvm/volume.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/lvm/volume.sls 2020-11-05 17:20:02.000000000 +0100 @@ -11,7 +11,7 @@ {% set info = device %} {% set device = device['name'] %} {% endif %} - {% do devices.append(device) %} + {% do devices.append(device) %} {{ macros.log('lvm', 'create_physical_volume_' ~ device) }} create_physical_volume_{{ device }}: lvm.pv_present: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/raid/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/raid/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/raid/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/raid/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -1,12 +1,20 @@ {% import 'macros.yml' as macros %} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('pkg', 'install_raid') }} install_raid: pkg.installed: - pkgs: - mdadm - dmraid + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/snapper/software.sls new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/snapper/software.sls --- old/yomi-0.0.1+git.1601999695.6141130/salt/yomi/storage/snapper/software.sls 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/salt/yomi/storage/snapper/software.sls 2020-11-05 17:20:02.000000000 +0100 @@ -1,5 +1,8 @@ {% import 'macros.yml' as macros %} +{% set software = pillar['software'] %} +{% set software_config = software.get('config', {}) %} + {{ macros.log('pkg', 'install_snapper') }} install_snapper: pkg.installed: @@ -8,7 +11,12 @@ - grub2-snapper-plugin - snapper-zypp-plugin - btrfsprogs + {% if software_config.get('minimal') %} - no_recommends: yes + {% endif %} + {% if not software_config.get('verify') %} + - skip_verify: yes + {% endif %} - root: /mnt - require: - mount: mount_/mnt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1601999695.6141130/tests/test_partitioned.py new/yomi-0.0.1+git.1604593202.a2c22bf/tests/test_partitioned.py --- old/yomi-0.0.1+git.1601999695.6141130/tests/test_partitioned.py 2020-10-06 17:54:55.000000000 +0200 +++ new/yomi-0.0.1+git.1604593202.a2c22bf/tests/test_partitioned.py 2020-11-05 17:20:02.000000000 +0100 @@ -30,21 +30,54 @@ class PartitionedTestCase(unittest.TestCase): @patch("states.partitioned.__salt__") def test_check_label(self, __salt__): - __salt__.__getitem__.return_value = lambda _: "Partition Table: msdos" + fdisk_output = """Error: /dev/sda: unrecognised disk label +BYT; +/dev/sda:25.8GB:scsi:512:512:unknown:ATA QEMU HARDDISK:; + +Error: /dev/sdb: unrecognised disk label +BYT; +/dev/sdb:25.8GB:scsi:512:512:unknown:ATA QEMU HARDDISK:; + +""" + __salt__.__getitem__.return_value = lambda _: fdisk_output + self.assertFalse(partitioned._check_label("/dev/sda", "msdos")) + self.assertFalse(partitioned._check_label("/dev/sda", "dos")) + self.assertFalse(partitioned._check_label("/dev/sda", "gpt")) + + fdisk_output = """BYT; +/dev/sda:25.8GB:scsi:512:512:msdos:ATA QEMU HARDDISK:; + +Error: /dev/sdb: unrecognised disk label +BYT; +/dev/sdb:25.8GB:scsi:512:512:unknown:ATA QEMU HARDDISK:; +""" + __salt__.__getitem__.return_value = lambda _: fdisk_output self.assertTrue(partitioned._check_label("/dev/sda", "msdos")) self.assertTrue(partitioned._check_label("/dev/sda", "dos")) self.assertFalse(partitioned._check_label("/dev/sda", "gpt")) - __salt__.__getitem__.return_value = lambda _: "" + fdisk_output = """BYT; +/dev/sda:500GB:scsi:512:512:gpt:ATA ST3500413AS:pmbr_boot; +1:1049kB:9437kB:8389kB:::bios_grub; +2:9437kB:498GB:498GB:btrfs::legacy_boot; +3:498GB:500GB:2147MB:linux-swap(v1)::swap; + +BYT; +/dev/sdb:2000GB:scsi:512:4096:msdos:ATA ST2000DM001-1CH1:; +1:1049kB:2000GB:2000GB:ext4::type=83; + +""" + __salt__.__getitem__.return_value = lambda _: fdisk_output self.assertFalse(partitioned._check_label("/dev/sda", "msdos")) - self.assertFalse(partitioned._check_label("/dev/sda", "gpt")) + self.assertFalse(partitioned._check_label("/dev/sda", "dos")) + self.assertTrue(partitioned._check_label("/dev/sda", "gpt")) @patch("states.partitioned.__opts__") @patch("states.partitioned.__salt__") def test_labeled(self, __salt__, __opts__): __opts__.__getitem__.return_value = False - __salt__.__getitem__.return_value = lambda _: "Partition Table: msdos" + __salt__.__getitem__.return_value = lambda _: "/dev/sda:msdos:" self.assertEqual( partitioned.labeled("/dev/sda", "msdos"), { @@ -58,7 +91,7 @@ __salt__.__getitem__.side_effect = ( lambda _: "", lambda _a, _b: True, - lambda _: "Partition Table: msdos", + lambda _: "/dev/sda:msdos:", ) self.assertEqual( partitioned.labeled("/dev/sda", "msdos"), ++++++ yomi.obsinfo ++++++ --- /var/tmp/diff_new_pack.rFRXSh/_old 2020-11-13 18:55:18.197857843 +0100 +++ /var/tmp/diff_new_pack.rFRXSh/_new 2020-11-13 18:55:18.197857843 +0100 @@ -1,5 +1,5 @@ name: yomi -version: 0.0.1+git.1601999695.6141130 -mtime: 1601999695 -commit: 614113073239d0419c219c49eaf8754da300eec8 +version: 0.0.1+git.1604593202.a2c22bf +mtime: 1604593202 +commit: a2c22bfa3d9f3db41f0cdcef42af731c981ea410 _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
