!53 [patch tracking] master 20201109043007661129 20201117003007661780

From: @wcc_140409 Reviewed-by: @small_leek Signed-off-by: @small_leek
2020-12-08 19:26:04 +08:00 · 2020-12-08 19:26:04 +08:00 · ac25d21671
commit ac25d21671
parent f1e9c75688 f632733e37
7 changed files with 462 additions and 1 deletions
--- a/Added-microdnf-support-in-XML-schema.patch
+++ b/Added-microdnf-support-in-XML-schema.patch
@ -0,0 +1,49 @@
+From 2d6867c20825c2f021e91365fd6ed4b1ad5db813 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Mon, 16 Nov 2020 16:37:58 +0100
+Subject: [PATCH] Added microdnf support in XML schema
+
+The XML schema did not allow to specify microdnf as
+supported package manager
+---
+ kiwi/schema/kiwi.rnc | 2 +-
+ kiwi/schema/kiwi.rng | 1 +
+ kiwi/xml_parse.py    | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
+index a9dc8d22c7..35f8750cb1 100644
+--- a/kiwi/schema/kiwi.rnc
+++ b/kiwi/schema/kiwi.rnc
+@@ -812,7 +812,7 @@ div {
+ #
+ div {
+     k.packagemanager.content = 
+-        "apt-get" | "zypper" | "yum" | "dnf" | "pacman"
+        "apt-get" | "zypper" | "yum" | "dnf" | "microdnf" | "pacman"
+     k.packagemanager.attlist = empty
+     k.packagemanager =
+         ## Name of the Package Manager
+diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
+index 270e2eaa83..3d2a12595c 100644
+--- a/kiwi/schema/kiwi.rng
+++ b/kiwi/schema/kiwi.rng
+@@ -1250,6 +1250,7 @@ the device is looked up in /dev/disk/by-* and /dev/mapper/*</a:documentation>
+         <value>zypper</value>
+         <value>yum</value>
+         <value>dnf</value>
+        <value>microdnf</value>
+         <value>pacman</value>
+       </choice>
+     </define>
+diff --git a/kiwi/xml_parse.py b/kiwi/xml_parse.py
+index 79b52455f3..3f103b7655 100644
+--- a/kiwi/xml_parse.py
+++ b/kiwi/xml_parse.py
+@@ -730,6 +730,7 @@ class k_packagemanager_content(object):
+     ZYPPER='zypper'
+     YUM='yum'
+     DNF='dnf'
+    MICRODNF='microdnf'
+     PACMAN='pacman'
+ 
--- a/Added-s390-SLE15-integration-tests.patch
+++ b/Added-s390-SLE15-integration-tests.patch
@ -0,0 +1,163 @@
+From 863722fb63f4af7256f7a4d879933b79febf386d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Wed, 19 Aug 2020 09:25:13 +0200
+Subject: [PATCH] Added s390 SLE15 integration tests
+
+---
+ .../sle15/test-image-vmx-oem/appliance.kiwi   | 84 +++++++++++++++++++
+ .../s390/sle15/test-image-vmx-oem/config.sh   | 42 ++++++++++
+ helper/build_status.sh                        |  1 +
+ 3 files changed, 127 insertions(+)
+ create mode 100644 build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi
+ create mode 100644 build-tests/s390/sle15/test-image-vmx-oem/config.sh
+
+diff --git a/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi b/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi
+new file mode 100644
+index 0000000000..cdc859f387
+--- /dev/null
+++ b/build-tests/s390/sle15/test-image-vmx-oem/appliance.kiwi
+@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
+
+<image schemaversion="7.2" name="SLE15">
+    <description type="system">
+        <author>Marcus Schäfer</author>
+        <contact>ms@suse.com</contact>
+        <specification>Virtual and Physical disk image test</specification>
+    </description>
+    <profiles>
+        <profile name="Virtual" description="Image for use with kvm"/>
+        <profile name="PhysicalBSZ_4096" description="Image for physical 4k storage disk CDL mode"/>
+    </profiles>
+    <preferences>
+        <version>1.15.1</version>
+        <packagemanager>zypper</packagemanager>
+        <locale>en_US</locale>
+        <keytable>us</keytable>
+        <timezone>Europe/Berlin</timezone>
+        <rpm-excludedocs>true</rpm-excludedocs>
+        <rpm-check-signatures>false</rpm-check-signatures>
+    </preferences>
+    <preferences profiles="Virtual">
+        <type image="vmx" filesystem="xfs" kernelcmdline="console=ttyS0 cio_ignore=all,!ipldev,!condev" format="qcow2">
+            <bootloader name="grub2_s390x_emu" console="serial" targettype="FBA"/>
+        </type>
+    </preferences>
+    <preferences profiles="PhysicalBSZ_4096">
+        <type image="oem" filesystem="ext4" initrd_system="dracut" kernelcmdline="console=ttyS0  cio_ignore=all,!ipldev,!condev" target_blocksize="4096">
+            <bootloader name="grub2_s390x_emu" console="serial" targettype="CDL"/>
+            <systemdisk>
+                <volume name="home"/>
+            </systemdisk>
+            <oemconfig>
+                <oem-swap>true</oem-swap>
+                <oem-swapsize>4096</oem-swapsize>
+            </oemconfig>
+        </type>
+    </preferences>
+    <users>
+        <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+    </users>
+    <repository type="rpm-md">
+        <source path="obsrepositories:/"/>
+    </repository>
+    <packages type="image">
+        <package name="patterns-base-minimal_base"/>
+        <package name="kernel-default"/>
+        <package name="iputils"/>
+        <package name="iproute2"/>
+        <package name="vim"/>
+        <package name="s390-tools"/>
+        <package name="grub2-s390x-emu"/>
+        <package name="grub2"/>
+        <package name="lvm2"/>
+        <package name="tar"/>
+        <package name="parted"/>
+        <package name="systemd"/>
+        <package name="dracut"/>
+        <package name="wicked"/>
+        <package name="openssh"/>
+        <package name="rsync"/>
+        <package name="psmisc"/>
+        <package name="sudo"/>
+        <package name="dhcp-client"/>
+        <package name="which"/>
+        <package name="btrfsprogs"/>
+        <package name="kexec-tools"/>
+        <package name="less"/>
+        <package name="patch"/>
+        <package name="util-linux"/>
+        <package name="timezone"/>
+        <package name="dracut-kiwi-oem-repart"/>
+    </packages>
+    <packages type="bootstrap">
+        <package name="udev"/>
+        <package name="filesystem"/>
+        <package name="glibc-locale"/>
+        <package name="cracklib-dict-full"/>
+        <package name="ca-certificates"/>
+        <package name="sles-release"/>
+    </packages>
+</image>
+diff --git a/build-tests/s390/sle15/test-image-vmx-oem/config.sh b/build-tests/s390/sle15/test-image-vmx-oem/config.sh
+new file mode 100644
+index 0000000000..3f41e7cf8e
+--- /dev/null
+++ b/build-tests/s390/sle15/test-image-vmx-oem/config.sh
+@@ -0,0 +1,42 @@
+#!/bin/bash
+#================
+# FILE          : config.sh
+#----------------
+# PROJECT       : OpenSuSE KIWI Image System
+# COPYRIGHT     : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
+#               :
+# AUTHOR        : Marcus Schaefer <ms@suse.de>
+#               :
+# BELONGS TO    : Operating System images
+#               :
+# DESCRIPTION   : configuration script for SUSE based
+#               : operating systems
+#               :
+#               :
+# STATUS        : BETA
+#----------------
+#======================================
+# Functions...
+#--------------------------------------
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+#======================================
+# Greeting...
+#--------------------------------------
+echo "Configure image: [$kiwi_iname]..."
+
+#======================================
+# Setup baseproduct link
+#--------------------------------------
+suseSetupProduct
+
+#======================================
+# Activate services
+#--------------------------------------
+suseInsertService sshd
+
+#======================================
+# Setup default target, multi-user
+#--------------------------------------
+baseSetRunlevel 3
+diff --git a/helper/build_status.sh b/helper/build_status.sh
+index b8fe0ea8da..09af11c964 100755
+--- a/helper/build_status.sh
+++ b/helper/build_status.sh
+@@ -9,6 +9,7 @@ for project in \
+     Virtualization:Appliances:Images:Testing_x86:fedora \
+     Virtualization:Appliances:Images:Testing_x86:ubuntu \
+     Virtualization:Appliances:Images:Testing_s390:suse \
+    Virtualization:Appliances:Images:Testing_s390:sle15 \
+     Virtualization:Appliances:Images:Testing_arm:suse \
+     Virtualization:Appliances:Images:Testing_arm:fedora \
+     Virtualization:Appliances:Images:Testing_ppc:suse \
--- a/Added-universal-box-to-build-status-helper.patch
+++ b/Added-universal-box-to-build-status-helper.patch
@ -0,0 +1,21 @@
+From 0d473758bc13a622b9b0aa57c7474fea4de5574d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Sun, 8 Nov 2020 20:43:35 +0100
+Subject: [PATCH] Added universal box to build status helper
+
+---
+ helper/build_status.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/helper/build_status.sh b/helper/build_status.sh
+index c740700076..177aaf34fa 100755
+--- a/helper/build_status.sh
+++ b/helper/build_status.sh
+@@ -4,6 +4,7 @@ for project in \
+     Virtualization:Appliances:SelfContained:fedora \
+     Virtualization:Appliances:SelfContained:suse \
+     Virtualization:Appliances:SelfContained:ubuntu \
+    Virtualization:Appliances:SelfContained:universal \
+     Virtualization:Appliances:Images:Testing_x86:suse \
+     Virtualization:Appliances:Images:Testing_x86:centos \
+     Virtualization:Appliances:Images:Testing_x86:fedora \
--- a/Cosmetic-update-for-build-status-helper.patch
+++ b/Cosmetic-update-for-build-status-helper.patch
@ -0,0 +1,58 @@
+From 0d006cf1225bd6ca76057ae11e731ff7b4cd0d97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Mon, 21 Sep 2020 17:04:08 +0200
+Subject: [PATCH] Cosmetic update for build status helper
+
+Show disabled integration test builds with a clear indicator
+---
+ helper/build_status.sh | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/helper/build_status.sh b/helper/build_status.sh
+index 09af11c964..c740700076 100755
+--- a/helper/build_status.sh
+++ b/helper/build_status.sh
+@@ -23,9 +23,11 @@ do
+             echo -e "$(echo $line |\
+                 sed -e s@^F@'\\033[31mF\\e[0m'@ |\
+                 sed -e s@^U@'\\033[33mU\\e[0m'@ |\
+                sed -e s@^D@'\\033[36mD\\e[0m'@ |\
+                 sed -e s@^\\.@'\\033[32m.\\e[0m'@)"
+         done < <(osc -A https://api.opensuse.org \
+-            results -V "${project}" | grep -B100 Legend | grep -v Legend
+            results -V "${project}" | sed -e 's@^   @  D @' |\
+            grep -B100 Legend | grep -v Legend
+         )
+     else
+         for package in $(osc -A https://api.opensuse.org list "${project}");do
+@@ -43,18 +45,18 @@ if [ ! "$1" = "refresh" ];then
+ cat << EOF
+ Legend:
+  . succeeded
+-   disabled
+- U unresolvable
+- F failed
+- B broken
+- b blocked
+- % building
+- f finished
+- s scheduled
+- L locked
+- x excluded
+- d dispatching
+- S signing
+ D Disabled
+ U unresolvable
+ F failed
+ B broken
+ b blocked
+ % building
+ f finished
+ s scheduled
+ L locked
+ x excluded
+ d dispatching
+ S signing
+  ? buildstatus not available
+ EOF
+ fi
--- a/Include-box-plugin-images-to-build_status.patch
+++ b/Include-box-plugin-images-to-build_status.patch
@ -0,0 +1,49 @@
+From 49d09e9667e90562470d58ab369614f2db8c5c0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Thu, 13 Aug 2020 11:17:33 +0200
+Subject: [PATCH] Include box plugin images to build_status
+
+Also show some colors for failed and unresolvable builds
+---
+ helper/build_status.sh | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/helper/build_status.sh b/helper/build_status.sh
+index ef93ee847c..b8fe0ea8da 100755
+--- a/helper/build_status.sh
+++ b/helper/build_status.sh
+@@ -1,6 +1,9 @@
+ #!/bin/bash
+
+ for project in \
+    Virtualization:Appliances:SelfContained:fedora \
+    Virtualization:Appliances:SelfContained:suse \
+    Virtualization:Appliances:SelfContained:ubuntu \
+     Virtualization:Appliances:Images:Testing_x86:suse \
+     Virtualization:Appliances:Images:Testing_x86:centos \
+     Virtualization:Appliances:Images:Testing_x86:fedora \
+@@ -9,13 +12,20 @@ for project in \
+     Virtualization:Appliances:Images:Testing_arm:suse \
+     Virtualization:Appliances:Images:Testing_arm:fedora \
+     Virtualization:Appliances:Images:Testing_ppc:suse \
+    Virtualization:Appliances:Images:Testing_ppc:sle15 \
+     Virtualization:Appliances:Images:Testing_ppc:fedora \
+     Virtualization:Appliances:Images:Testing_x86:archlinux
+ do
+     echo "${project}"
+     if [ ! "$1" = "refresh" ];then
+-        osc -A https://api.opensuse.org \
+        while read -r line;do
+            echo -e "$(echo $line |\
+                sed -e s@^F@'\\033[31mF\\e[0m'@ |\
+                sed -e s@^U@'\\033[33mU\\e[0m'@ |\
+                sed -e s@^\\.@'\\033[32m.\\e[0m'@)"
+        done < <(osc -A https://api.opensuse.org \
+             results -V "${project}" | grep -B100 Legend | grep -v Legend
+        )
+     else
+         for package in $(osc -A https://api.opensuse.org list "${project}");do
+             if [[ "${package}" =~ ^test- ]];then
+~
+~
+~
--- a/Simplify-build_status-helpe.patch
+++ b/Simplify-build_status-helpe.patch
@ -0,0 +1,108 @@
+From 575f7788f2af100d7cc1e102637d3a8653caceea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
+Date: Tue, 11 Aug 2020 11:54:50 +0200
+Subject: [PATCH] Simplify build_status helper
+
+Instead of a static list with all integration test build names
+only maintain a list of integration test build project names
+---
+ helper/build_status.sh | 86 +++++++++++++++++++++---------------------
+ 1 file changed, 43 insertions(+), 43 deletions(-)
+
+diff --git a/helper/build_status.sh b/helper/build_status.sh
+index 670c5b161f..ef93ee847c 100755
+--- a/helper/build_status.sh
+++ b/helper/build_status.sh
+@@ -1,49 +1,49 @@
+ #!/bin/bash
+
+-for image in \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-azure \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-docker \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-docker-derived\
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-ec2 \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-gce \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-iso \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-luks \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-MicroOS \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-oem \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-oem-legacy \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-orthos-oem \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-overlayroot \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-pxe \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-qcow-openstack\
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-tbz \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-vmx \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-vmx-lvm \
+-    Virtualization:Appliances:Images:Testing_x86:suse/test-image-custom-partitions \
+-    Virtualization:Appliances:Images:Testing_x86:centos/test-image-iso-oem-vmx \
+-    Virtualization:Appliances:Images:Testing_x86:fedora/test-image-iso-oem-vmx \
+-    Virtualization:Appliances:Images:Testing_x86:ubuntu/test-image-iso-oem-vmx \
+-    Virtualization:Appliances:Images:Testing_s390:suse/test-image-oem \
+-    Virtualization:Appliances:Images:Testing_s390:suse/test-image-vmx \
+-    Virtualization:Appliances:Images:Testing_arm:suse/test-image-iso \
+-    Virtualization:Appliances:Images:Testing_arm:suse/test-image-rpi-oem \
+-    Virtualization:Appliances:Images:Testing_arm:fedora/test-image-iso \
+-    Virtualization:Appliances:Images:Testing_ppc:suse/test-image-vmx \
+-    Virtualization:Appliances:Images:Testing_ppc:fedora/test-image-vmx \
+-    Virtualization:Appliances:Images:Testing_x86:archlinux/test-image-iso-oem-vmx-kis
+for project in \
+    Virtualization:Appliances:Images:Testing_x86:suse \
+    Virtualization:Appliances:Images:Testing_x86:centos \
+    Virtualization:Appliances:Images:Testing_x86:fedora \
+    Virtualization:Appliances:Images:Testing_x86:ubuntu \
+    Virtualization:Appliances:Images:Testing_s390:suse \
+    Virtualization:Appliances:Images:Testing_arm:suse \
+    Virtualization:Appliances:Images:Testing_arm:fedora \
+    Virtualization:Appliances:Images:Testing_ppc:suse \
+    Virtualization:Appliances:Images:Testing_ppc:fedora \
+    Virtualization:Appliances:Images:Testing_x86:archlinux
+ do
+-    project=$(echo "${image}" | cut -f1 -d/)
+-    package=$(echo "${image}" | cut -f2 -d/)
+-    if [ "${project_last}" != "${project}" ];then
+-        echo
+-        echo "$project"
+-    fi
+-    echo "${package}"
+-    osc -A https://api.opensuse.org \
+-        results "${project}" "${package}"
+-    if [ "$1" = "refresh" ];then
+-        echo -n "[refresh requested: ]"
+    echo "${project}"
+    if [ ! "$1" = "refresh" ];then
+         osc -A https://api.opensuse.org \
+-            service remoterun "${project}" "${package}"
+            results -V "${project}" | grep -B100 Legend | grep -v Legend
+    else
+        for package in $(osc -A https://api.opensuse.org list "${project}");do
+            if [[ "${package}" =~ ^test- ]];then
+                echo -n "[refresh requested for ${package}: ]"
+                osc -A https://api.opensuse.org \
+                    service remoterun "${project}" "${package}"
+            fi
+        done
+        echo
+     fi
+-    project_last="${project}"
+ done
+
+if [ ! "$1" = "refresh" ];then
+cat << EOF
+Legend:
+ . succeeded
+   disabled
+ U unresolvable
+ F failed
+ B broken
+ b blocked
+ % building
+ f finished
+ s scheduled
+ L locked
+ x excluded
+ d dispatching
+ S signing
+ ? buildstatus not available
+EOF
+fi
--- a/kiwi.spec
+++ b/kiwi.spec
@ -2,13 +2,20 @@

 Name:           kiwi
 Version:        9.21.5
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Flexible operating system image builder

 URL:            http://osinside.github.io/kiwi/
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz

+Patch0:	Added-microdnf-support-in-XML-schema.patch
+Patch1:	Simplify-build_status-helpe.patch
+Patch2:	Include-box-plugin-images-to-build_status.patch
+Patch3:	Added-s390-SLE15-integration-tests.patch
+Patch4:	Cosmetic-update-for-build-status-helper.patch
+Patch5:	Added-universal-box-to-build-status-helper.patch
+
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils

@ -189,6 +196,12 @@ done
 %{_mandir}/man8/%{name}*

 %changelog
+* Thu Nov 26 2020 wuchaochao <wuchaochao4@huawei.com> - 9.21.5-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix issues: 124E39 125NZG
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5