From 4dd7ab4cc10bcaba437183f69d4c6dc22d05d4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Thu, 14 Nov 2019 09:45:00 +0100 Subject: [PATCH] Update s390 integration tests Added vmx build test to run in kvm on s390. Updated the existing oem build test to deploy on DASD. The concept of the network setup invented by kiwi for s390 does no longer apply and was also not used on the s390 distribution --- .../s390/suse/test-image-oem/appliance.kiwi | 2 +- .../s390/suse/test-image-oem/config.sh | 39 ++---------- .../root/etc/init.d/kiwi/dasd/01-network.sh | 25 -------- .../root/etc/init.d/kiwi/zfcp/01-network.sh | 25 -------- .../root/etc/sysconfig/network/ifcfg-eth0 | 4 -- .../test-image-oem/root/etc/sysconfig/syslog | 49 --------------- .../s390/suse/test-image-vmx/appliance.kiwi | 59 +++++++++++++++++++ .../s390/suse/test-image-vmx/config.sh | 42 +++++++++++++ 8 files changed, 106 insertions(+), 139 deletions(-) delete mode 100755 build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh delete mode 100755 build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh delete mode 100644 build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0 delete mode 100644 build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog create mode 100644 build-tests/s390/suse/test-image-vmx/appliance.kiwi create mode 100644 build-tests/s390/suse/test-image-vmx/config.sh diff --git a/build-tests/s390/suse/test-image-oem/appliance.kiwi b/build-tests/s390/suse/test-image-oem/appliance.kiwi index 82b7dbea..4b2abb74 100644 --- a/build-tests/s390/suse/test-image-oem/appliance.kiwi +++ b/build-tests/s390/suse/test-image-oem/appliance.kiwi @@ -14,7 +14,7 @@ en_US us Europe/Berlin - + 20 diff --git a/build-tests/s390/suse/test-image-oem/config.sh b/build-tests/s390/suse/test-image-oem/config.sh index 3968775b..e11f2667 100644 --- a/build-tests/s390/suse/test-image-oem/config.sh +++ b/build-tests/s390/suse/test-image-oem/config.sh @@ -10,48 +10,17 @@ test -f /.profile && . /.profile #-------------------------------------- echo "Configure image: [$kiwi_iname]..." -#====================================== -# Mount system filesystems -#-------------------------------------- -baseMount - -#====================================== -# Activate services -#-------------------------------------- -suseActivateDefaultServices -suseRemoveService gpm -suseRemoveService nfs -suseRemoveService boot.cpi - #====================================== # Setup baseproduct link #-------------------------------------- suseSetupProduct #====================================== -# Add missing gpg keys to rpm +# Activate services #-------------------------------------- -suseImportBuildKey +suseInsertService sshd #====================================== -# Remove all documentation +# Setup default target, multi-user #-------------------------------------- -baseStripDocs - -#====================================== -# only basic version of vim is -# installed; no syntax highlighting -#-------------------------------------- -sed -i -e's/^syntax on/" syntax on/' /etc/vimrc - -#====================================== -# SuSEconfig -#-------------------------------------- -suseConfig - -#====================================== -# Umount kernel filesystems -#-------------------------------------- -baseCleanMount - -exit 0 +baseSetRunlevel 3 diff --git a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh b/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh deleted file mode 100755 index b248ea88..00000000 --- a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# s390 network hardware setup -# ---- -#====================================== -# Functions... -#-------------------------------------- -. /include - -portname=VSWL2 -readchannel=0.0.0800 -writechannel=0.0.0801 -datachannel=0.0.0802 -qeth_up=1 - -#====================================== -# Include kernel parameters -#-------------------------------------- -includeKernelParameters - -#====================================== -# Bring the device online -#-------------------------------------- -qeth_configure -p $portname -l \ - $readchannel $writechannel $datachannel $qeth_up - diff --git a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh b/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh deleted file mode 100755 index b248ea88..00000000 --- a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# s390 network hardware setup -# ---- -#====================================== -# Functions... -#-------------------------------------- -. /include - -portname=VSWL2 -readchannel=0.0.0800 -writechannel=0.0.0801 -datachannel=0.0.0802 -qeth_up=1 - -#====================================== -# Include kernel parameters -#-------------------------------------- -includeKernelParameters - -#====================================== -# Bring the device online -#-------------------------------------- -qeth_configure -p $portname -l \ - $readchannel $writechannel $datachannel $qeth_up - diff --git a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0 b/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0 deleted file mode 100644 index b01f9e19..00000000 --- a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0 +++ /dev/null @@ -1,4 +0,0 @@ -BOOTPROTO='dhcp' -MTU='' -REMOTE_IPADDR='' -STARTMODE='onboot' diff --git a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog b/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog deleted file mode 100644 index c26d0d3e..00000000 --- a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog +++ /dev/null @@ -1,49 +0,0 @@ -## Path: System/Logging -## Description: System logging -## Type: list(0,1,2,3,4,5,6,7) -## Default: 1 -## Config: "" -## ServiceRestart: syslog -# -# Default loglevel for klogd -# -KERNEL_LOGLEVEL=7 - -## Type: string -## Default: "" -## Config: "" -## ServiceRestart: syslog -# -# if not empty: parameters for syslogd -# for example SYSLOGD_PARAMS="-r -s my.dom.ain" -# -SYSLOGD_PARAMS="" - -## Type: string -## Default: -x -## Config: "" -## ServiceRestart: syslog -# -# if not empty: parameters for klogd -# for example KLOGD_PARAMS="-x" to avoid (duplicate) symbol resolution -# -KLOGD_PARAMS="-x" - -## Type: list(syslogd,syslog-ng,"") -## Default: "" -## Config: "" -## ServiceRestart: syslog -# -# The name of the syslog daemon to use as syslog service: -# "syslogd", "syslog-ng" or "" for autodetect. -# -SYSLOG_DAEMON="" - -## Type: string -## Default: "" -## Config: "" -## ServiceRestart: syslog -# -# Parameters for Syslog New-Generation - see syslog-ng(8) -# -SYSLOG_NG_PARAMS="" diff --git a/build-tests/s390/suse/test-image-vmx/appliance.kiwi b/build-tests/s390/suse/test-image-vmx/appliance.kiwi new file mode 100644 index 00000000..c0fef789 --- /dev/null +++ b/build-tests/s390/suse/test-image-vmx/appliance.kiwi @@ -0,0 +1,59 @@ + + + + + Marcus Schäfer + ms@suse.com + vmx disk s390 test build to run in kvm + + + 1.15.1 + zypper + en_US + us + Europe/Berlin + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build-tests/s390/suse/test-image-vmx/config.sh b/build-tests/s390/suse/test-image-vmx/config.sh new file mode 100644 index 00000000..3f41e7cf --- /dev/null +++ b/build-tests/s390/suse/test-image-vmx/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 +# : +# 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