diff options
80 files changed, 12674 insertions, 408 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 7d75f460c7..1a64cb271a 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -113,6 +113,10 @@ python write_specfile () { source_list = os.listdir(ar_outdir) source_number = 0 for source in source_list: + # do_deploy_archives may have already run (from sstate) meaning a .src.rpm may already + # exist in ARCHIVER_OUTDIR so skip if present. + if source.endswith(".src.rpm"): + continue # The rpmbuild doesn't need the root permission, but it needs # to know the file's user and group name, the only user and # group in fakeroot is "root" when working in fakeroot. diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index c5b0556cf8..64e71d99d7 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -6,9 +6,8 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.28" - -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.3/" -UNINATIVE_CHECKSUM[i686] ?= "44253cddbf629082568cea4fff59419106871a0cf81b4845b5d34e7014887b20" -UNINATIVE_CHECKSUM[x86_64] ?= "c6954563dad3c95608117c6fc328099036c832bbd924ebf5fdccb622fc0a8684" +UNINATIVE_MAXGLIBCVERSION = "2.29" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.4/" +UNINATIVE_CHECKSUM[i686] ?= "fafacfc537a6ce2bd122bd16c146881ab5ac69bd575abf6cb68a0dd33fa70ea2" +UNINATIVE_CHECKSUM[x86_64] ?= "06f91685b782f2ccfedf3070b3ba0fe4a5ba2f0766dad5c9d1642dccf95accd0" diff --git a/meta/lib/oe/maketype.py b/meta/lib/oe/maketype.py index f88981dd90..c36e7b5604 100644 --- a/meta/lib/oe/maketype.py +++ b/meta/lib/oe/maketype.py @@ -7,7 +7,12 @@ the arguments of the type's factory for details. import inspect import oe.types as types -import collections +try: + # Python 3.7+ + from collections.abc import Callable +except ImportError: + # Python < 3.7 + from collections import Callable available_types = {} @@ -96,7 +101,7 @@ for name in dir(types): continue obj = getattr(types, name) - if not isinstance(obj, collections.Callable): + if not isinstance(obj, Callable): continue register(name, obj) diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 94afe394ed..caeb5e31ec 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -112,7 +112,7 @@ class Screen(Terminal): bb.event.fire(bb.event.LogExecTTY(msg, "screen -r %s" % s_id, 0.5, 10), d) else: - logger.warn(msg) + logger.warning(msg) class TmuxRunning(Terminal): """Open a new pane in the current running tmux window""" @@ -168,7 +168,7 @@ class Tmux(Terminal): if d: bb.event.fire(bb.event.LogExecTTY(msg, attach_cmd, 0.5, 10), d) else: - logger.warn(msg) + logger.warning(msg) class Custom(Terminal): command = 'false' # This is a placeholder @@ -180,7 +180,7 @@ class Custom(Terminal): if not '{command}' in self.command: self.command += ' {command}' Terminal.__init__(self, sh_cmd, title, env, d) - logger.warn('Custom terminal was started.') + logger.warning('Custom terminal was started.') else: logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set') raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set') diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index ef008454ff..cd6db234a4 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -58,7 +58,7 @@ class OETestContext(object): self.suites = self.loader.discover() def runTests(self, skips=[]): - self.runner = self.runnerClass(self, descriptions=False, verbosity=2) + self.runner = self.runnerClass(self, descriptions=False, verbosity=2, buffer=True) # Dinamically skip those tests specified though arguments self.skipTests(skips) diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index f8bb23f344..0e6d215db1 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py @@ -43,11 +43,6 @@ class OETestResult(_TestResult): self.tc = tc def startTest(self, test): - # Allow us to trigger the testcase buffer mode on a per test basis - # so stdout/stderr are only printed upon failure. Enables debugging - # but clean output - if hasattr(test, "buffer"): - self.buffer = test.buffer super(OETestResult, self).startTest(test) def logSummary(self, component, context_msg=''): diff --git a/meta/lib/oeqa/files/testresults/testresults.json b/meta/lib/oeqa/files/testresults/testresults.json new file mode 100644 index 0000000000..1a62155618 --- /dev/null +++ b/meta/lib/oeqa/files/testresults/testresults.json @@ -0,0 +1,40 @@ +{ + "runtime_core-image-minimal_qemuarm_20181225195701": { + "configuration": { + "DISTRO": "poky", + "HOST_DISTRO": "ubuntu-16.04", + "IMAGE_BASENAME": "core-image-minimal", + "IMAGE_PKGTYPE": "rpm", + "LAYERS": { + "meta": { + "branch": "master", + "commit": "801745d918e83f976c706f29669779f5b292ade3", + "commit_count": 52782 + }, + "meta-poky": { + "branch": "master", + "commit": "801745d918e83f976c706f29669779f5b292ade3", + "commit_count": 52782 + }, + "meta-yocto-bsp": { + "branch": "master", + "commit": "801745d918e83f976c706f29669779f5b292ade3", + "commit_count": 52782 + } + }, + "MACHINE": "qemuarm", + "STARTTIME": "20181225195701", + "TEST_TYPE": "runtime" + }, + "result": { + "apt.AptRepoTest.test_apt_install_from_repo": { + "log": "Test requires apt to be installed", + "status": "PASSED" + }, + "buildcpio.BuildCpioTest.test_cpio": { + "log": "Test requires autoconf to be installed", + "status": "ERROR" + } + } + } +}
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/abat.patch b/meta/lib/oeqa/manual/abat.patch new file mode 100644 index 0000000000..1541ac80cb --- /dev/null +++ b/meta/lib/oeqa/manual/abat.patch @@ -0,0 +1,64 @@ +######## +diff --git a/glxgears_check.sh b/glxgears_check.sh +index 17622b8..c4d3b97 100755 +--- a/glxgears_check.sh ++++ b/glxgears_check.sh +@@ -31,7 +31,7 @@ else + + sleep 6 + +- XPID=$( ps ax | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') ++ XPID=$( ps | awk '{print $1, $5}' | grep glxgears | awk '{print $1}') + if [ ! -z "$XPID" ]; then + kill -9 $XPID >/dev/null 2>&1 + echo "glxgears can run, PASS!" +diff --git a/x_close.sh b/x_close.sh +index e287be1..3429f1a 100755 +--- a/x_close.sh ++++ b/x_close.sh +@@ -22,7 +22,7 @@ + # + function close_proc(){ + echo "kill process Xorg" +-XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" | awk '{print $1}') ++XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" | awk '{print $1}') + if [ ! -z "$XPID" ]; then + kill $XPID + sleep 4 +diff --git a/x_start.sh b/x_start.sh +index 9cf6eab..2305796 100755 +--- a/x_start.sh ++++ b/x_start.sh +@@ -24,7 +24,7 @@ + X_ERROR=0 + + #test whether X has started +-PXID=$(ps ax |awk '{print $1,$5}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') ++PXID=$(ps |awk '{print $1,$6}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}') + if [ ! -z "$PXID" ]; then + echo "[WARNING] Xorg has started!" + XORG_STATUS="started" +@@ -35,9 +35,11 @@ else + #start up the x server + echo "Start up the X server for test in display $DISPLAY................" + +- $XORG_DIR/bin/X >/dev/null 2>&1 & ++ #$XORG_DIR/bin/X >/dev/null 2>&1 & ++ #sleep 8 ++ #xterm & ++ /etc/init.d/xserver-nodm start & + sleep 8 +- xterm & + fi + XLOG_FILE=/var/log/Xorg.0.log + [ -f $XORG_DIR/var/log/Xorg.0.log ] && XLOG_FILE=$XORG_DIR/var/log/Xorg.0.log +@@ -54,7 +56,7 @@ fi + X_ERROR=1 + fi + +- XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') ++ XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}') + if [ -z "$XPID" ]; then + echo "Start up X server FAIL!" + echo +########
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/bsp-hw.json b/meta/lib/oeqa/manual/bsp-hw.json new file mode 100644 index 0000000000..4b7c76f70f --- /dev/null +++ b/meta/lib/oeqa/manual/bsp-hw.json @@ -0,0 +1,1286 @@ +[ + { + "test": { + "@alias": "bsps-hw.bsps-hw.rpm_-__install_dependency_package", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Get a not previously installed RPM package or build one on local machine, which should have run-time dependency.For example, \"mc\" (Midnight Commander, which is a visual file manager) should depend on \"ncurses-terminfo\". \n\n$ bitbake mc \n\n\n", + "expected_results": "" + }, + "2": { + "action": "Copy the package into a system folder (for example /home/root/rpm_packages). \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Run \"rpm -ivh package_name\" and check the output, for example \"rpm -ivh mc.rpm*\" should report the dependency on \"ncurses-terminfo\".\n\n\n\n", + "expected_results": "3 . rpm command should report message when some RPM installation depends on other packages." + } + }, + "summary": "rpm_-__install_dependency_package" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.boot_and_install_from_USB", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "plugin usb which contains live image burned", + "expected_results": "User can choose install system from usb stick onto harddisk from boot menu or command line option \n" + }, + "2": { + "action": "configure device BIOS to firstly boot from USB if necessary", + "expected_results": "Installed system can boot up" + }, + "3": { + "action": "boot the device and select option \"Install\" from boot menu", + "expected_results": "" + }, + "4": { + "action": "proceed through default install process", + "expected_results": "" + }, + "5": { + "action": "Remove USB, and reboot into new installed system. \nNote: If installation was successfully completed and received this message \"\"(sdx): Volume was not properly unmounted...Please run fsck.\"\" ignore it because this was whitelisted according to bug 9652.", + "expected_results": "" + } + }, + "summary": "boot_and_install_from_USB" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.live_boot_from_USB", + "author": [ + { + "email": "juan.fernandox.ramos.frayle@intel.com", + "name": "juan.fernandox.ramos.frayle@intel.com" + } + ], + "execution": { + "1": { + "action": "Plugin usb which contains live image burned.", + "expected_results": "User can choose boot from live image on usb stick from boot menu or command line option" + }, + "2": { + "action": "Configure device BIOS to firstly boot from USB if necessary.", + "expected_results": "" + }, + "3": { + "action": "Reboot the device and boot from USB stick.", + "expected_results": "Live image can boot up with usb stick" + } + }, + "summary": "live_boot_from_USB" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.boot_from_runlevel_3", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Boot into system and edit /etc/inittab to make sure that system enter at the run level 3 by default, this is done by changing the line \n\n\nid:5:initdefault \n\nto \n\nid:3:initdefault \n\n", + "expected_results": "" + }, + "2": { + "action": "Reboot system, and press \"Tab\" to enter \"grub\"", + "expected_results": "" + }, + "3": { + "action": "Get into the \"kernel\" line with the edit option \"e\" and add \"psplash=false text\" at the end line.", + "expected_results": "" + }, + "4": { + "action": "Press \"F10\" or \"ctrl+x\" to boot system", + "expected_results": "" + }, + "5": { + "action": "If system ask you for a login type \"root\"", + "expected_results": "System should boot to run level 3, showing the command prompt." + } + }, + "summary": "boot_from_runlevel_3" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.boot_from_runlevel_5", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Boot into system and edit /etc/inittab to make sure that system enter at the run level 5 by default, this is done by changing the line \n\nid:3:initdefault \n\nto \n\nid:5:initdefault \n\n", + "expected_results": "" + }, + "2": { + "action": "Reboot system, and press \"Tab\" to enter \"grub\"", + "expected_results": "" + }, + "3": { + "action": "Get into the \"kernel\" line with the edit option \"e\" and add \"psplash=false text\" at the end line.", + "expected_results": "" + }, + "4": { + "action": "Press \"F10\" or \"ctrl+x\" to boot system \nNote: The test is only for sato image.", + "expected_results": "System should boot to runlevel 5 ." + } + }, + "summary": "boot_from_runlevel_5" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.shutdown_system", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "" + }, + "2": { + "action": "launch terminal and run \"shutdown -h now\" or \"poweroff\"", + "expected_results": "System can be shutdown successfully . " + } + }, + "summary": "shutdown_system" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.reboot_system", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "" + }, + "2": { + "action": "launch terminal and run \"reboot\"", + "expected_results": "System can reboot successfully . " + } + }, + "summary": "reboot_system" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.switch_among_multi_applications_and_desktop", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "launch several applications(like contacts, file manager, notes, etc)", + "expected_results": "user could switch among multi applications and desktop" + }, + "2": { + "action": "launch terminal", + "expected_results": "" + }, + "3": { + "action": "switch among multi applications and desktop", + "expected_results": "" + }, + "4": { + "action": "close applications \nNote: The case is for sato image only. ", + "expected_results": "" + } + }, + "summary": "switch_among_multi_applications_and_desktop" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.USB_-_mount", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Boot system \n\n", + "expected_results": "" + }, + "2": { + "action": "Plug USB stick, it should be mount in /run/media/sd(x) If X-window system does not start and show USB device, then use the terminal to mount it, following the next steps: \na. Locate the usb stick (usually it is on /dev/sdb) \nb. Create a directory with \"mkdir stick\" (so you will have such a path as: /home/root/stick). \nc. Run the command \"mount /dev/sdb /home/root/stick\" to mount USB device on it. \n\n", + "expected_results": "USB device should be mounted in /run/media/sd(x) \nor in /home/root/stick \n\n" + }, + "3": { + "action": "Then you can access USB stick (/home/root/stick) via Terminal or GUI and try various commands and actions like \"cp\", \"mv\", \"touch\" and \"rm\". Type \"dmesg\" command and check for recent mounted devices.", + "expected_results": "Basic commands work properly. The system sends a notification in \"dmesg\" command, showing that the USB stick is accessible and the device is mounted ." + } + }, + "summary": "USB_-_mount" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.USB_-_read_files", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "view/copy successfully" + }, + "2": { + "action": "plug usb stick", + "expected_results": "" + }, + "3": { + "action": "view files in usb by file browser", + "expected_results": "" + }, + "4": { + "action": "copy some files from usb to local hardware", + "expected_results": "" + } + }, + "summary": "USB_-_read_files" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.USB_-_umount", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "usb directory in file browser automatically missed" + }, + "2": { + "action": "plug usb stick", + "expected_results": "" + }, + "3": { + "action": "view files in usb by file browser \n4.unplug usb", + "expected_results": "" + } + }, + "summary": "USB_-_umount" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.USB_-_write_files", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "create/copy successfully" + }, + "2": { + "action": "plug usb stick", + "expected_results": "" + }, + "3": { + "action": "create files in usb \n4.copy some files from local hardware to usb", + "expected_results": "" + } + }, + "summary": "USB_-_write_files" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.ethernet_static_ip_set_in_connman", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Boot the system and check internet connection is on . ", + "expected_results": "" + }, + "2": { + "action": "Launch connmand-properties (up-right corner on desktop)", + "expected_results": "" + }, + "3": { + "action": "Choose Ethernet device and set a valid static ip address for it. \nFor example, in our internal network, we can set as following: \nip address: 10.239.48.xxx \nMask: 255.255.255.0 \nGateway (Broadcast): 10.239.48.255", + "expected_results": "" + }, + "4": { + "action": "Check the Network configuration with \"ifconfig\"", + "expected_results": "Static IP was set successfully \n" + }, + "5": { + "action": "ping to another IP adress", + "expected_results": "Ping works correclty\n" + } + }, + "summary": "ethernet_static_ip_set_in_connman" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.ethernet_get_IP_in_connman_via_DHCP", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Launch connmand-properties (up-right corner on your desktop). ", + "expected_results": "" + }, + "2": { + "action": "Check if Ethernet device can work properly with static IP, doing \"ping XXX.XXX.XXX.XXX\", once this is set.", + "expected_results": "Ping executed successfully . \n\n" + }, + "3": { + "action": "Then choose DHCP method for Ethernet device in connmand-properties.", + "expected_results": "" + }, + "4": { + "action": "Check with 'ifconfig\" and \"ping\" if Ethernet device get IP address via DHCP.", + "expected_results": "Ethernet device can get dynamic IP address via DHCP in connmand ." + } + }, + "summary": "ethernet_get_IP_in_connman_via_DHCP" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.connman_offline_mode_in_connman-gnome", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Launch connman-properties after system booting \n\n", + "expected_results": "" + }, + "2": { + "action": "choose \"offline mode\" and check the connection of all network interfaces ", + "expected_results": "All connection should be off after clicking \"offline mode\" . " + } + }, + "summary": "connman_offline_mode_in_connman-gnome" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.X_server_can_start_up_with_runlevel_5_boot", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot up system with default runlevel \n\n", + "expected_results": "X server can start up well and desktop display has no problem . \n\n" + }, + "2": { + "action": "type runlevel at command prompt", + "expected_results": "Output:N 5" + } + }, + "summary": "X_server_can_start_up_with_runlevel_5_boot" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.standby", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system and launch terminal; check output of \"date\" and launch script \"continue.sh\"", + "expected_results": "" + }, + "2": { + "action": "echo \"mem\" > /sys/power/state", + "expected_results": "" + }, + "3": { + "action": "After system go into S3 mode, move mouse or press any key to make it resume (on NUC press power button)", + "expected_results": "" + }, + "4": { + "action": "Check \"date\" and script \"continue.sh\"", + "expected_results": "" + }, + "5": { + "action": "Check if application can work as normal \ncontinue.sh as below: \n \n#!/bin/sh \n \ni=1 \nwhile [ 0 ] \ndo \n echo $i \n sleep 1 \n i=$((i+1)) \ndone ", + "expected_results": "Screen should resume back and script can run continuously incrementing the i's value from where it was before going to standby state. Date should be the same with the corresponding time increment." + } + }, + "summary": "standby" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.check_CPU_utilization_after_standby", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Start up system", + "expected_results": "" + }, + "2": { + "action": "run \"top\" command and check if there is any process eating CPU time", + "expected_results": "" + }, + "3": { + "action": "make system into standby and resume it", + "expected_results": "" + }, + "4": { + "action": "run \"top\" command and check if there is any difference with the data before standby", + "expected_results": "There should be no big difference before/after standby with \"top\" . " + } + }, + "summary": "check_CPU_utilization_after_standby" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_if_LAN_device_works_well_after_resume_from_suspend_state", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system and launch terminal", + "expected_results": "" + }, + "2": { + "action": "echo \"mem\" > /sys/power/state", + "expected_results": "" + }, + "3": { + "action": "After system go into S3 mode, move mouse or press any key to make it resume", + "expected_results": "" + }, + "4": { + "action": "check ping status \n\nNote: This TC apply only for core-image-full-cmd and core-image-lsb .", + "expected_results": "ping should always work before/after standby" + } + }, + "summary": "Test_if_LAN_device_works_well_after_resume_from_suspend_state" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_if_usb_hid_device_works_well_after_resume_from_suspend_state", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system and launch terminal", + "expected_results": "" + }, + "2": { + "action": "echo \"mem\" > /sys/power/state", + "expected_results": "" + }, + "3": { + "action": "After system go into S3 mode, resume the device by pressing the power button or using HID devices", + "expected_results": "Devices resumes " + }, + "4": { + "action": "check usb mouse and keyboard", + "expected_results": "Usb mouse and keyboard should work" + } + }, + "summary": "Test_if_usb_hid_device_works_well_after_resume_from_suspend_state" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.click_terminal_icon_on_X_desktop", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "After system launch and X start up, click terminal icon on desktop", + "expected_results": "" + }, + "2": { + "action": "Check if only one terminal window launched and no other problem met", + "expected_results": "There should be no problem after launching terminal . " + } + }, + "summary": "click_terminal_icon_on_X_desktop" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Add_multiple_files_in_media_player", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Launch media player", + "expected_results": "" + }, + "2": { + "action": "Add multiple files(5 files) in media player at same time (ogg or wav)", + "expected_results": "" + }, + "3": { + "action": "Verify the sound.", + "expected_results": "Media player should be OK with this action, it reproduce files correctly." + } + }, + "summary": "Add_multiple_files_in_media_player" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.check_bash_in_image", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "After system is up, check if bash command exists with command \"which bash\"", + "expected_results": "bash command should exist in image giving something as below \"/bin/bash\"" + } + }, + "summary": "check_bash_in_image" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.MicroSD_-__mount", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "system notify that MicroSDis accessible" + }, + "2": { + "action": "plug MicroSD card", + "expected_results": "" + } + }, + "summary": "MicroSD_-__mount" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.MicroSD_-__read_files", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "view/copy successfully" + }, + "2": { + "action": "plug MicroSD card", + "expected_results": "" + }, + "3": { + "action": "view files inMicroSD by file browser", + "expected_results": "" + }, + "4": { + "action": "copy some files fromMicroSD to local hardware", + "expected_results": "" + } + }, + "summary": "MicroSD_-__read_files" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.MicroSD_-__umount", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "MicroSD in file browser automatically missed . " + }, + "2": { + "action": "plug MicroSD card", + "expected_results": "" + }, + "3": { + "action": "view files in MicroSDby file browser", + "expected_results": "" + }, + "4": { + "action": "unplug MicroSD", + "expected_results": "" + } + }, + "summary": "MicroSD_-__umount" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.MicroSD_-__write_files", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot system", + "expected_results": "create/copy successfully" + }, + "2": { + "action": "plug MicroSD card", + "expected_results": "" + }, + "3": { + "action": "create files in MicroSD", + "expected_results": "" + }, + "4": { + "action": "copy some files from local hardware to MicroSD", + "expected_results": "" + } + }, + "summary": "MicroSD_-__write_files" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.video_-_libva_check_(ogg_video_play)", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "check if libva is installed on system (or libogg)", + "expected_results": "" + }, + "2": { + "action": "copy sample ogg file to system", + "expected_results": "" + }, + "3": { + "action": "launch media player can play the ogg file", + "expected_results": "ogg file can be played without problem when libva is used (or libogg) " + } + }, + "summary": "video_-_libva_check_(ogg_video_play)" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.media_player_-_play_video_(ogv)", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "copy sample ogv file to system", + "expected_results": "" + }, + "2": { + "action": "launch media player and make sure it can play the ogv file", + "expected_results": "ogv file can be played without problem" + } + }, + "summary": "media_player_-_play_video_(ogv)" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.media_player_-_stop/play_button_(ogv)", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "copy sample ogv file to system", + "expected_results": "" + }, + "2": { + "action": "launch media player can play the ogv file", + "expected_results": "" + }, + "3": { + "action": "click \"stop\" button to stop playing", + "expected_results": "" + }, + "4": { + "action": "click \"start\" button to resume playing", + "expected_results": "ogv file can be start/stop without problem" + } + }, + "summary": "media_player_-_stop/play_button_(ogv)" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.audio_-_play_(ogg)_with_HDMI", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "copy sample ogg file to system", + "expected_results": "" + }, + "2": { + "action": "connect system with a monitor with HDMI", + "expected_results": "" + }, + "3": { + "action": "launch media player and play the ogg file", + "expected_results": "ogg file can be played without problem with HDMI" + } + }, + "summary": "audio_-_play_(ogg)_with_HDMI" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.audio_-_play_(wav)_with_HDMI", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "copy sample wav file to system", + "expected_results": "" + }, + "2": { + "action": "connect system with a monitor with HDMI", + "expected_results": "" + }, + "3": { + "action": "launch media player and play the wav file", + "expected_results": "wav file can be played without problem, with HDMI" + } + }, + "summary": "audio_-_play_(wav)_with_HDMI" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Graphics_-_ABAT", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Download ABAT test suite from internal git repository, git clone git://tinderbox.sh.intel.com/git/abat", + "expected_results": "" + }, + "2": { + "action": "Apply following patch to make it work on yocto environment", + "expected_results": "" + }, + "3": { + "action": "Run \"./abat.sh\" to run ABAT test refer to abat.patch", + "expected_results": "All ABAT test should pass. \nNote : If below 3 fails appears ignore them. \n- start up X server fail.. due is already up \n- module [intel_agp] \n- module [i915]" + } + }, + "summary": "Graphics_-_ABAT" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Graphics_-_x11perf_-_2D", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Run \"x11perf -aa10text\" and \"x11perf -rgb10text\"", + "expected_results": "" + }, + "2": { + "action": "Get the FPS result and compare it with upstream graphics data on Sandybridge", + "expected_results": "There should not be big regression between Yocto and upstream linux . " + } + }, + "summary": "Graphics_-_x11perf_-_2D" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Check_if_SATA_disk_can_work_correctly", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "Run fdisk command to create partition on SATA disk. ", + "expected_results": "The SATA device can mount, umount, read and write. " + }, + "2": { + "action": "Mount/Umount \n mke2fs /dev/sda1 \n mount -t ext2 /dev/sda1 /mnt/disk \n umount /mnt/disk", + "expected_results": "" + }, + "3": { + "action": "Read/Write (filesystem) \n touch /mnt/disk/test.txt \n echo abcd > /mnt/disk/test.txt \n cat /mnt/disk/test.txt", + "expected_results": "" + }, + "4": { + "action": "Read/Write (raw) \n dd if=/dev/sda1 of=/tmp/test bs=1k count=1k \n This command will read 1MB from /dev/sda1 to /tmp/test", + "expected_results": "" + } + }, + "summary": "Check_if_SATA_disk_can_work_correctly" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Install_and_boot_from_USB-drive_to_HDD-drive", + "author": [ + { + "email": "david.israelx.rodriguez.castellanos@intel.com", + "name": "david.israelx.rodriguez.castellanos@intel.com" + } + ], + "execution": { + "1": { + "action": "Get a HDD drive.", + "expected_results": "User can choose install system from USB stick on HDD drive from boot menu or command line option \n" + }, + "2": { + "action": "Plugin USB which contains live image burned (USB1).", + "expected_results": "Installed system can boot up." + }, + "3": { + "action": "Configure device BIOS to firstly boot from USB if necessary", + "expected_results": "" + }, + "4": { + "action": "Boot the device and select option \"Install\" from boot menu.", + "expected_results": "" + }, + "5": { + "action": "Make sure that the divice in which image is going to be installed is the HDD drive.", + "expected_results": "" + }, + "6": { + "action": "Proceed through default install process.", + "expected_results": "" + }, + "7": { + "action": "Remove USB1, and reboot into new installed system.", + "expected_results": "" + } + }, + "summary": "Install_and_boot_from_USB-drive_to_HDD-drive" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Install_and_boot_from_USB-drive_to_SD-drive", + "author": [ + { + "email": "david.israelx.rodriguez.castellanos@intel.com", + "name": "david.israelx.rodriguez.castellanos@intel.com" + } + ], + "execution": { + "1": { + "action": "Get a SD-drive with enough free space to install an image.", + "expected_results": "User can choose install system from USB stick on SD-drive from boot menu or command line option. \n" + }, + "2": { + "action": "Plugin USB which contains live image burned (USB1).", + "expected_results": "Installed system can boot up." + }, + "3": { + "action": "Configure device BIOS to firstly boot from USB if necessary", + "expected_results": "" + }, + "4": { + "action": "Boot the device and select option \"Install\" from boot menu.", + "expected_results": "" + }, + "5": { + "action": "Make sure that the device in which image is going to be installed is the SD-drive.", + "expected_results": "" + }, + "6": { + "action": "Proceed through default install process.", + "expected_results": "" + }, + "7": { + "action": "Remove USB1, and reboot into new installed system.", + "expected_results": "" + } + }, + "summary": "Install_and_boot_from_USB-drive_to_SD-drive" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_boot_on_serial_communication_SD", + "author": [ + { + "email": "juan.fernandox.ramos.frayle@intel.com", + "name": "juan.fernandox.ramos.frayle@intel.com" + } + ], + "execution": { + "1": { + "action": "1.- Create a yocto project image in a SD card \nexample \n2 - Configure a connection like shown in the link avobe: \nhttps://wiki.yoctoproject.org/wiki/MinnowMax_board_Serial_video_connection_guide \n3 - Verify the Minow Max board is connected to the host \n4 - Boot the system to desktop \n5 - Open a Terminal and check the IP \nIn Terminal type $ifconfig\"", + "expected_results": "Verify you can create a live image \n" + } + }, + "summary": "Test_boot_on_serial_communication_SD" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_boot_on_serial_communication_HDD", + "author": [ + { + "email": "juan.fernandox.ramos.frayle@intel.com", + "name": "juan.fernandox.ramos.frayle@intel.com" + } + ], + "execution": { + "1": { + "action": "1 - Create a yocto project image in a HDD \nexample \n2 - Configure a connection like shown in the link avobe: \nhttps://wiki.yoctoproject.org/wiki/MinnowMax_board_Serial_video_connection_guide \n3 - Verify the Minow Max board is connected to the host \n4 - Boot the system to desktop \n5 - Open a Terminal and check the IP \nIn Terminal type $ifconfig\"> ", + "expected_results": "Verify you can create a live image \n" + } + }, + "summary": "Test_boot_on_serial_communication_HDD" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_boot_on_serial_communication_USB", + "author": [ + { + "email": "juan.fernandox.ramos.frayle@intel.com", + "name": "juan.fernandox.ramos.frayle@intel.com" + } + ], + "execution": { + "1": { + "action": "1.- Create a yocto project image in a USB \nexample <dd if= core-image-sato-sdk.hddimg of =/dev/sdb>", + "expected_results": "Verify you can create a live image \n" + }, + "2": { + "action": "Configure a connection like shown in the link avobe: \nhttps://wiki.yoctoproject.org/wiki/MinnowMax_board_Serial_video_connection_guide\n\n", + "expected_results": "Video signal is present and not delayed \n" + }, + "3": { + "action": " Verify the Minow Max board is connected to the host", + "expected_results": "Verify the system boot ok and no errors are present \n" + }, + "4": { + "action": " Boot the system to desktop", + "expected_results": " Check that a valid IP is retrieved" + }, + "5": { + "action": " Open a Terminal and check the IP \nIn Terminal type $ifconfig\" ", + "expected_results": "" + } + }, + "summary": "Test_boot_on_serial_communication_USB" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Test_Seek_bar_and_volume_control", + "author": [ + { + "email": "juan.fernandox.ramos.frayle@intel.com", + "name": "juan.fernandox.ramos.frayle@intel.com" + } + ], + "execution": { + "1": { + "action": "Run media player and load a media file ", + "expected_results": "Media player correctly open audio/video file \n" + }, + "2": { + "action": "Verify that seek and volume control are present ", + "expected_results": "Seek bar and volume control are present \n" + }, + "3": { + "action": "Verify that selecting the speaker icon opens the volume control", + "expected_results": "Volume control bar must appear \n" + }, + "4": { + "action": "Verify you can increase and decrease volume level with the volume control", + "expected_results": "Volume level must be increased and decreased \n" + }, + "5": { + "action": "Observe that slider on the seek bar moves along with the video/audio play", + "expected_results": "Video/audio file can be played and slider moves along with the video/audio play \n" + }, + "6": { + "action": "Verify you can navigate the video with the slider back and forward", + "expected_results": "The slider can move back and forward in the seek bar \n" + }, + "7": { + "action": "Verify that seek and volume control are functional in full screen mode", + "expected_results": "Press the full screen mode icon, seek bar and volume control must work fine \n" + }, + "8": { + "action": "Verify that pressing << or >> while playing a file makes the slide goes slow/backwards or faster", + "expected_results": "Verify << and >> works correctly" + } + }, + "summary": "Test_Seek_bar_and_volume_control" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Check_if_watchdog_can_reset_the_target_system", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "1.Check if watchdog device exist in /dev/ directory. Run command echo 1 > /dev/watchdog and wait for 60s. Then, the target will reboot.", + "expected_results": "The watchdog device exist in /dev/ directory and can reboot the target.\n" + } + }, + "summary": "Check_if_watchdog_can_reset_the_target_system" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Check_if_RTC_(Real_Time_Clock)_can_work_correctly", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "Read time from RTC registers. root@localhost:/root> hwclock -r Sun Mar 22 04:05:47 1970 -0.001948 seconds ", + "expected_results": "Can read and set the time from RTC.\n" + }, + "2": { + "action": "Set system current time root@localhost:/root> date 062309452008 ", + "expected_results": "" + }, + "3": { + "action": "Synchronize the system current time to RTC registers root@localhost:/root> hwclock -w ", + "expected_results": "" + }, + "4": { + "action": "Read time from RTC registers root@localhost:/root> hwclock -r ", + "expected_results": "" + }, + "5": { + "action": "Reboot target and read time from RTC again\n", + "expected_results": "" + } + }, + "summary": "Check_if_RTC_(Real_Time_Clock)_can_work_correctly" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Check_if_target_can_support_EEPROM", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "Check eeprom device exist in /sys/bus/i2c/devices/ ", + "expected_results": "Hexdump can read data from eeprom.\n" + }, + "2": { + "action": "Run \"hexdump eeprom\" commandroot@mpc8315e-rdb:/sys/bus/i2c/devices/1-0051> hexdump eeprom0000000 9210 0b02 0211 0009 0b52 0108 0c00 3c000000010 6978 6930 6911 208c 7003 3c3c 00f0 8381\u2026\n", + "expected_results": "" + } + }, + "summary": "Check_if_target_can_support_EEPROM" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.System_can_boot_up_via_NFS", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "Connect the board's first serial port to your workstation and then start up your favourite serial terminal so that you will be able to interact with the serial console. If you don't have a favourite, picocom is suggested: $ picocom /dev/ttyS0 -b 115200 ", + "expected_results": "The system can boot up without problem\n" + }, + "2": { + "action": "Power up or reset the board and press a key on the terminal when prompted to get to the U-Boot command line ", + "expected_results": "" + }, + "3": { + "action": "Set up the environment in U-Boot: => setenv ipaddr => setenv serverip ", + "expected_results": "" + }, + "4": { + "action": "Download the kernel and boot: => tftp tftp $loadaddr vmlinux => bootoctlinux $loadaddr coremask=0x3 root=/dev/nfs rw nfsroot=: ip=::::edgerouter:eth0:off mtdparts=phys_mapped_flash:512k(boot0),512k(boot1),64k@3072k(eeprom)\n", + "expected_results": "" + } + }, + "summary": "System_can_boot_up_via_NFS" + } + }, + { + "test": { + "@alias": "bsps-hw.bsps-hw.Boot_from_JFFS2_image", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "First boot the board with NFS root. ", + "expected_results": "The system can boot up without problem\n" + }, + "2": { + "action": "Install mtd-utils package. Erase the MTD partition which will be used as root: $ flash_eraseall /dev/mtd3 ", + "expected_results": "" + }, + "3": { + "action": "Copy the JFFS2 image to the MTD partition: $ flashcp core-image-minimal-mpc8315e-rdb.jffs2 /dev/mtd3 ", + "expected_results": "" + }, + "4": { + "action": "Then reboot the board and set up the environment in U-Boot: => setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=ttyS0,115200 ", + "expected_results": "" + } + }, + "summary": "Boot_from_JFFS2_image" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/bsp-qemu.json b/meta/lib/oeqa/manual/bsp-qemu.json new file mode 100644 index 0000000000..cf51b6ab1c --- /dev/null +++ b/meta/lib/oeqa/manual/bsp-qemu.json @@ -0,0 +1,222 @@ +[ + { + "test": { + "@alias": "bsps-qemu.bsps-tools.qemu_can_be_started_with_KVM_enabled", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Build a kernel with KVM enabled \n\nIn Local.conf add \n\nQEMU_USE_KVM = \"${@ '1' if os.access('/dev/kvm', os.R_OK|os.W_OK) else '0' }\" \n\n ", + "expected_results": "" + }, + "2": { + "action": "Start qemu with option \"kvm\" with runqemu \n a. If you start qemu with kvm failed, maybe it is because host not install kvm and vhost_net module. Follow below link to install them. \n b. vhost_test refer: https://wiki.yoctoproject.org/wiki/Running_an_x86_Yocto_Linux_image_under_QEMU_KVM \n c. kvm refer: https://wiki.yoctoproject.org/wiki/How_to_enable_KVM_for_Poky_qemu", + "expected_results": "" + }, + "3": { + "action": "Check if qemu starts up and if kvm_intel module is used", + "expected_results": "" + }, + "4": { + "action": "If kvm_intel module is not used when starting qemu, it will show 0 in \"Used by\" column when you run \"lsmod | grep kvm_intel\" ", + "expected_results": "KVM enabled with qemu \nExecute \"lsmod | grep kvm_intel\" from your host twice, before and after you \nstart the qemu with kvm option. Before start, the number should be 0, \nafter start, the number should bigger than 0." + } + }, + "summary": "qemu_can_be_started_with_KVM_enabled" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-tools.Post-installation_logging", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": "Download the poky source and set environment \n", + "expected_results": "The /var/log/postinstall.log should exist in the first boot. The content of this log is like below: \n\nRunning postinst /etc/rpm-postinsts/man... \nList directory to check the output log \nbin \nboot \ndev \netc \nhome \nlib \nlost+found \nmedia \nmnt \nproc \nrun \nsbin \nsys \ntmp \nusr \nvar \nList nonexist directory to check the stderr redirection log \nls: /nonexist: No such file or directory " + }, + "2": { + "action": "Add the following lines to a .bb file. For expample, meta/recipes-connectivity/openssh/openssh_6.2p2.bb: \n\npkg_postinst_ontarget_${PN} () { \n #!/bin/sh -e \n if [ x\"$D\" = \"x\" ]; then \n echo \"List directory to check the output log\" \n ls / \n echo \"List nonexist directory to check the stderr redirection log\" \n ls /nonexist \n else \n exit 1 \n fi \n} \n\nMake sure the feature \"debug-tweaks\" is added in conf/local.conf \n", + "expected_results": "" + }, + "3": { + "action": "Add ssh-server-openssh to EXTRA_IMAGE_FEATURES in local.conf \n", + "expected_results": "" + }, + "4": { + "action": "Build core-image-minimal \n", + "expected_results": "" + }, + "5": { + "action": "Boot up the image and check the /var/log/postinstall.log ", + "expected_results": "" + } + }, + "summary": "Post-installation_logging" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-tools.Add_user_with_cleartext_type_password_during_filesystem_construction", + "author": [ + { + "email": "ke.zou@windriver.com", + "name": "ke.zou@windriver.com" + } + ], + "execution": { + "1": { + "action": "Download the poky source and set the environment \n\n", + "expected_results": "No error during image building procedure. \n" + }, + "2": { + "action": "Add the following lines in conf/local.conf \n\nINHERIT += \"extrausers\" \n\nEXTRA_USERS_PARAMS = \"\\ \nuseradd -s /bin/sh -P 'tester3' tester3;\\ \n\" \n\nThe above settings do the following things: \na. Add a user tester3 with cleartext password 'tester3' ", + "expected_results": "Image can boot up \n" + }, + "3": { + "action": "Build the image\n ", + "expected_results": "Login with user name \"tester3\" and password \"tester3\" " + } + }, + "summary": "Add_user_with_cleartext_type_password_during_filesystem_construction" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-tools.rpm_-__install_dependency_package", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Get a not previously installed RPM package or build one on local machine, which should have run-time dependency.For example, \"mc\" (Midnight Commander, which is a visual file manager) should depend on \"ncurses-terminfo\". \n\n$ bitbake mc \n\n\n", + "expected_results": "" + }, + "2": { + "action": "Copy the package into a system folder (for example /home/root/rpm_packages). \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Run \"rpm -ivh package_name\" and check the output, for example \"rpm -ivh mc.rpm*\" should report the dependency on \"ncurses-terminfo\".\n\n\n\n", + "expected_results": "3 . rpm command should report message when some RPM installation depends on other packages." + } + }, + "summary": "rpm_-__install_dependency_package" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-tools.Check_rpm_install/removal_log_file_size(auto)", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Get some rpm or other kind of installation packages. \n\n", + "expected_results": "Steps 1- 4 (more than 2.3) \nEach file will occupy around 10MB, and there should be some method to keep rpm log in a small size. (the size of the db of RPMs must not be taking so much space) \nStep 5 (less than or equal to 2.3)\nThe size on /var/lib/rpm/ must keep around 30MB" + }, + "2": { + "action": "After system is up, check the size of log file named as \"log.xxxxxx\" on /var/lib/rpm/log \n\n", + "expected_results": "" + }, + "3": { + "action": "After several install/removal of packages, with either of the install/removal commands (rpm/smart/zypper/dnf install/removal), check again the size of log file. \n\n", + "expected_results": "" + }, + "4": { + "action": "For packages installation, there will be some database files under /var/lib/rpm/, named as \"__db.xxx\" and there will be some log files \nunder /var/lib/rpm/log, named as \"\"log.xxxxxx\"\". \n\nNote: You will only see the log.xxxx on /var/lib/rpm/log mentioned above if the poky version is minor than 2.3.For poky 2.3 or major versions this has been modified and the package RPM4 does not show the logs.xxxx. if major, follow the next step. \n\n", + "expected_results": "" + }, + "5": { + "action": "Repeat steps (1 and 3) and check the size of /var/lib/rpm/ \n\nMore info: https://bugzilla.yoctoproject.org/show_bug.cgi?id=9259", + "expected_results": "" + } + }, + "summary": "Check_rpm_install/removal_log_file_size" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-runtime.only_one_connmand_in_background(auto)", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Boot system", + "expected_results": "" + }, + "2": { + "action": "Run \"ps aux |grep connmand\" or \"ps -ef | grep connmand\" or \"ps | grep connmand\"", + "expected_results": "Connmand (connection manager, used to manage internet connections) should be shown as an active process \n\n" + }, + "3": { + "action": "Run command \"connmand\" to try to launch to a second connmand process", + "expected_results": "" + }, + "4": { + "action": "Check, with \"ps\" connmand if a second connmand can be generated ", + "expected_results": "There should be only one connmand process instance in background ." + } + }, + "summary": "only_one_connmand_in_background" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-runtime.X_server_can_start_up_with_runlevel_5_boot", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "boot up system with default runlevel \n\n", + "expected_results": "X server can start up well and desktop display has no problem . \n\n" + }, + "2": { + "action": "type runlevel at command prompt", + "expected_results": "Output:N 5" + } + }, + "summary": "X_server_can_start_up_with_runlevel_5_boot" + } + }, + { + "test": { + "@alias": "bsps-qemu.bsps-runtime.check_bash_in_image", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "After system is up, check if bash command exists with command \"which bash\"", + "expected_results": "bash command should exist in image giving something as below \"/bin/bash\"" + } + }, + "summary": "check_bash_in_image" + } + } +] diff --git a/meta/lib/oeqa/manual/build-appliance.json b/meta/lib/oeqa/manual/build-appliance.json new file mode 100644 index 0000000000..70f8c72c9b --- /dev/null +++ b/meta/lib/oeqa/manual/build-appliance.json @@ -0,0 +1,96 @@ +[ + { + "test": { + "@alias": "build-appliance.build-appliance.Build_core-image-minimal_with_build-appliance-image", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Build with AUTOREV or download from Autobuilder an image for Yocto Build Appliance. ", + "expected_results": "" + }, + "2": { + "action": "Boot the image under VMWare Player. ", + "expected_results": "" + }, + "3": { + "action": "Build qemux86 core-image-minimal using bitbake command line in the build-appliance-image ", + "expected_results": "" + }, + "4": { + "action": "Launch the image just built using runqemu. ", + "expected_results": "core-image-minimal should build and boot. " + } + }, + "summary": "Build_core-image-minimal_with_build-appliance-image" + } + }, + { + "test": { + "@alias": "build-appliance.build-appliance.Build_a_image_without_error_(added_recipe)", + "author": [ + { + "email": "sstncr@gmail.com", + "name": "sstncr@gmail.com" + } + ], + "execution": { + "1": { + "action": "Launch Build Appliance", + "expected_results": "User could build a image without error and the added package is in the image" + }, + "2": { + "action": "Set \"Machine\" in conf/local.conf, for example, qemuarm", + "expected_results": "" + }, + "3": { + "action": "Install a new package to the image, for example, acpid. Set the following line in conf/local.conf: IMAGE_INSTALL_append = \" acpid\"", + "expected_results": "" + }, + "4": { + "action": "Build a image using bitbake command line, for example, bitbake core-image-minimal", + "expected_results": "" + }, + "5": { + "action": "After build finished, launch the image and check if the added package built into image", + "expected_results": "" + } + }, + "summary": "Build_a_image_without_error_(added_recipe)." + } + }, + { + "test": { + "@alias": "build-appliance.build-appliance.Create_core-image-sato-sdk_using_build_appliance", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Build with AUTOREV or download from Autobuilder an image for Yocto Build Appliance. ", + "expected_results": "" + }, + "2": { + "action": "Boot the image under VMWare Player. ", + "expected_results": "" + }, + "3": { + "action": "Build qemux86 core-image-sato-sdk using bitbake command line in the build-appliance-image ", + "expected_results": "" + }, + "4": { + "action": "Launch the image just built using runqemu. ", + "expected_results": "" + } + }, + "summary": "Create_core-image-sato-sdk_using_build_appliance" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/compliance-test.json b/meta/lib/oeqa/manual/compliance-test.json new file mode 100644 index 0000000000..982f0b46cd --- /dev/null +++ b/meta/lib/oeqa/manual/compliance-test.json @@ -0,0 +1,194 @@ +[ + { + "test": { + "@alias": "compliance-test.compliance-test.LTP_subset_test_suite", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "For real hardware, run following component, \nsyscalls \nfs \nfsx \ndio \nio \nmm \nipc \nsched \nmath \nnptl \npty \nadmin_tools \ntimers \ncommands \n\nFor QEMU, run following component \nsyscalls \nmm \nipc \nsched \nmath \nnptl \npty \nadmin_tools \ncommands \n\nRun Instructions: \nLTP download: http://sourceforge.net/projects/ltp/files/LTP%20Source/ltp-20120401/ltp-full-20120401.bz2/download \n\n(link is outdated, always use the last version released or the one found in the image) \n\n\n\nbuild steps: refer to http://ltp.sourceforge.net \n\nRun steps:", + "expected_results": "" + }, + "2": { + "action": "Build LTP with toolchain or in sdk image. Or use a sato-sdk image which has LTP already included in /opt/ltp", + "expected_results": "" + }, + "3": { + "action": "For QEMU, create the qemu target with \"-m 512\", which makes some memory stress cases pass. For some issues, we could only set 128M for qemuarm and 256M for qemumips.", + "expected_results": "" + }, + "4": { + "action": "Copy LTP folder into target, for example, /opt/ltp if you have built it yourself. Modify the default scenario file \"scenario_groups/default\", remove test suites not to be tested", + "expected_results": "" + }, + "5": { + "action": "Comment runtests/sched: hackbench, which is not suitable to run in emulators. Reminder (comment it also for Sugarbay Devices).", + "expected_results": "" + }, + "6": { + "action": "Comment oom01, oom02, oom03, oom04 in runtest/mm, which consume lots of memory", + "expected_results": "" + }, + "7": { + "action": "From /opt/ltp run: ./runltp -p -l result-M2-20101218.log -C result-M2-20101218.fail -d /opt/ltp/tmp &> result-M2-20101218.fulllog \n\n", + "expected_results": "Check the result on wiki, https://wiki.yoctoproject.org/wiki/LTP_result, there should be no regression failure met." + } + }, + "summary": "LTP_subset_test_suite" + } + }, + { + "test": { + "@alias": "compliance-test.compliance-test.POSIX_subset_test_suite", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "In a sato-sdk image go to /opt/ltp or get latest LTP sourcecode, download location is http://sourceforge.net/projects/ltp/files/LTP%20Source/ and install it.", + "expected_results": "" + }, + "2": { + "action": "Go into the folder of LTP, and posix_testsuite is under testcases/open_posix_testsuite/", + "expected_results": "" + }, + "3": { + "action": "Run connmand: make generate-makefiles", + "expected_results": "" + }, + "4": { + "action": "Run connmand: make conformance-all", + "expected_results": "" + }, + "5": { + "action": "Run connmand: make conformance-test (this step may show errors, ignore them)", + "expected_results": "" + }, + "6": { + "action": "Run connmand: make tools-all", + "expected_results": "" + }, + "7": { + "action": "Run connmand: sh posix.sh > posix.log, posix.sh as below: \n \n#!/bin/sh \n./bin/run-posix-option-group-test.sh AIO \n./bin/run-posix-option-group-test.sh MEM \n./bin/run-posix-option-group-test.sh MSG \n./bin/run-posix-option-group-test.sh SEM \n./bin/run-posix-option-group-test.sh SIG \n./bin/run-posix-option-group-test.sh THR \n./bin/run-posix-option-group-test.sh TMR \n./bin/run-posix-option-group-test.sh TPS \n \n", + "expected_results": "" + }, + "8": { + "action": "Check the posix.log after testing is finished", + "expected_results": "Compare the test result on wiki, https://wiki.yoctoproject.org/wiki/Posix_result, there should be no more regression failures met." + } + }, + "summary": "POSIX_subset_test_suite" + } + }, + { + "test": { + "@alias": "compliance-test.compliance-test.LSB_subset_test_suite", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Get lsd-sdk image and install it on target device or start the image(if it is QEMU) with option \"-m 512M\"", + "expected_results": "" + }, + "2": { + "action": "Comment in /opt/lsb-test/session any tests you don't want to run.", + "expected_results": "" + }, + "3": { + "action": "Run /usr/bin/LSB_Test.sh which should download the LSB suite and set it up. Some packages may fail to download because their location changed on ftp.linuxfoundation.org. You need to manually update /opt/lsb-test/packages_list", + "expected_results": "" + }, + "4": { + "action": "Tests should start automatically, you can use the web interface to reconfigure the setup. ", + "expected_results": "Check the result on wiki https://wiki.yoctoproject.org/wiki/LSB_Result No regression failures should be met." + } + }, + "summary": "LSB_subset_test_suite" + } + }, + { + "test": { + "@alias": "compliance-test.compliance-test.stress_test_-_Genericx86-64", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Bootup with core-image-lsb-sdk image", + "expected_results": "" + }, + "2": { + "action": "Execute the crashme test with below command \n\n./opt/ltp/runltp f crashme", + "expected_results": "The stress testing should not make the target crash. Check CPU usage and basic functionality of the system after the tests are over. " + } + }, + "summary": "stress_test_-_Genericx86-64" + } + }, + { + "test": { + "@alias": "compliance-test.compliance-test.stress_test_-_- crashme_-_-Beaglebone", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": " Get crashme from http://people.delphiforums.com/gjc/crashme.html", + "expected_results": "" + }, + "2": { + "action": "Follow the setup steps on above URL, build crashme in target", + "expected_results": "" + }, + "3": { + "action": " Run crashme for 24 hours", + "expected_results": "Target should not crash with the program." + } + }, + "summary": "stress_test_-_crashme_-Beaglebone" + } + }, + { + "test": { + "@alias": "compliance-test.compliance-test.stress_test_-_ltp_-Beaglebone", + "author": [ + { + "email": "corneliux.stoicescu@intel.com", + "name": "corneliux.stoicescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Build LTP with toolchain or in sdk image", + "expected_results": "" + }, + "2": { + "action": "Copy LTP folder into target, for example, /opt/ltp. Modify script, testscripts/ltpstress.sh, set Iostat=1, NO_NETWORK=1", + "expected_results": "" + }, + "3": { + "action": "cd testscripts/ && ./ltpstress.sh", + "expected_results": "This stress case will run for 24 hours Check the result\ntarget should not crash with the program " + } + }, + "summary": "stress_test_-_-ltp_-Beaglebone" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/crops.json b/meta/lib/oeqa/manual/crops.json new file mode 100644 index 0000000000..1cf3c8f30c --- /dev/null +++ b/meta/lib/oeqa/manual/crops.json @@ -0,0 +1,294 @@ +[ + { + "test": { + "@alias": "crops-default.crops-default.sdkext_eSDK_devtool_build_make", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 5 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\n\n", + "expected_results": "" + }, + "2": { + "action": " Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": "Create the following tree of files <crops-esdk-workdir-workspace>/sdkext/files/myapp <crops-esdk-workdir-workspace>/sdkext/files/myapp_cmake \n\n\n", + "expected_results": "" + }, + "4": { + "action": " Create the following files withing the myapp directory myapp.c and the Makefile. Write the following inside of each file: \n---------------------------------------- \nMakefile should contain \n\nall: myapp \n\nmyapp: myapp.o \n\t$(CC) $(LDFLAGS) $< -o $@ \n\nmyapp.o: myapp.c \n\t$(CC) $(CFLAGS) -c $< -o $@ \n\nclean: \n\trm -rf myapp.o myapp \n\n----------------------------- \nmyapp.c shold contain \n\n\n#include <stdio.h> \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n \n\treturn 0; \n} \n------------------------------------ \n\n", + "expected_results": "be sure that the indentations on the makefile are tabs not spaces. \n\n" + }, + "5": { + "action": " Create the following files within the myapp_cmake directory CMakeLists.txt and myapp.c. Write the following inside each file: \n\n------------------------------------ \nCMakeLists.txt should contain: \n\ncmake_minimum_required (VERSION 2.6) \nproject (myapp) \n# The version number. \nset (myapp_VERSION_MAJOR 1) \nset (myapp_VERSION_MINOR 0) \n\n# add the executable \nadd_executable (myapp myapp.c) \n\ninstall(TARGETS myapp \nRUNTIME DESTINATION bin) \n\n------------------------------------------ \nmyapp.c should contain: \n\n#include <stdio.h> \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n\n\treturn 0; \n} \n------------------------------------------------- \n\n", + "expected_results": "Be sure that the indentations on CMakeLists.txt is tabs not spaces." + }, + "6": { + "action": " source environment-setup-i586-poky-linux \n\n", + "expected_results": "This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n\n" + }, + "7": { + "action": " run command which devtool \n\n", + "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n " + }, + "8": { + "action": "devtool add myapp <directory>(this is myapp dir) \n\n\n", + "expected_results": "The directory you should input is the myapp directory. This should automatically create the recipe myapp.bb under <crops-esdk-workdir-workspace>/recipes/myapp/myapp.bb" + }, + "9": { + "action": " devtool build myapp \n\n", + "expected_results": "This should compile an image" + }, + "10": { + "action": " devtool reset myapp ", + "expected_results": "This cleans sysroot of the myapp recipe, but it leaves the source tree intact. meaning it does not erase." + } + }, + "summary": "sdkext_eSDK_devtool_build_make" + } + }, + { + "test": { + "@alias": "crops-default.crops-default.sdkext_devtool_build_esdk_package", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 5 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\n\n", + "expected_results": "" + }, + "2": { + "action": " Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": " Create the following tree of files <crops-esdk-workdir-workspace>/sdkext/files/myapp/ \n <crops-esdk-workdir-workspace>/sdkext/files/myapp_cmake \n\n", + "expected_results": "" + }, + "4": { + "action": " Create the following files withing the myapp directory myapp.c and the Makefile. Write the following inside of each file: \n---------------------------------------- \nMakefile should contain \n\nall: myapp \n\nmyapp: myapp.o \n\t$(CC) $(LDFLAGS) $< -o $@ \n\nmyapp.o: myapp.c \n\t$(CC) $(CFLAGS) -c $< -o $@ \n\nclean: \n\trm -rf myapp.o myapp \n\n----------------------------- \nmyapp.c shold contain \n\n#include <stdio.h> \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n \n\treturn 0; \n} \n------------------------------------ \n\n", + "expected_results": "be sure that the indentations on the makefile are tabs not spaces. \n\n" + }, + "5": { + "action": " Create the following files within the myapp_cmake directory CMakeLists.txt and myapp.c. Write the following inside each file: \n\n------------------------------------ \nCMakeLists.txt should contain: \n\ncmake_minimum_required (VERSION 2.6) \nproject (myapp) \n# The version number. \nset (myapp_VERSION_MAJOR 1) \nset (myapp_VERSION_MINOR 0) \n\n# add the executable \nadd_executable (myapp myapp.c) \n\ninstall(TARGETS myapp \nRUNTIME DESTINATION bin) \n\n------------------------------------------ \nmyapp.c should contain: \n\n#include<stdio.h> \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n\n\treturn 0; \n} \n------------------------------------------------- \n\n", + "expected_results": "Be sure that the indentations on CMakeLists.txt is tabs not spaces. \n\n" + }, + "6": { + "action": " source environment-setup-i586-poky-linux \n\n", + "expected_results": "This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n\n" + }, + "7": { + "action": " run command which devtool \n\n", + "expected_results": " this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" + }, + "8": { + "action": " devtool add myapp <directory> (this is myapp dir) \n\n", + "expected_results": " The directory you should input is the myapp directory. This should automatically create the recipe myapp.bb under <crops-esdk-workdir-workspace>/recipes/myapp/myapp.bb \n\n" + }, + "9": { + "action": " devtool package myapp \n\n", + "expected_results": " you should expect a package creation of myapp and it should be under the /tmp/deploy/ \n\n" + }, + "10": { + "action": " devtool reset myapp ", + "expected_results": "This cleans sysroot of the myapp recipe, but it leaves the source tree intact. meaning it does not erase.\n</package_format>" + } + }, + "summary": "sdkext_devtool_build_esdk_package" + } + }, + { + "test": { + "@alias": "crops-default.crops-default.sdkext_devtool_build_cmake", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 5 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\n\n", + "expected_results": "" + }, + "2": { + "action": " Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": " Create the following tree of files <crops-esdk-workdir-workspace>/sdkext/files/myapp \n <crops-esdk-workdir-workspace>/sdkext/files/myapp_cmake \n\n", + "expected_results": "" + }, + "4": { + "action": " Create the following files withing the myapp directory myapp.c and the Makefile. Write the following inside of each file: \n---------------------------------------- \nMakefile should contain \n\nall: myapp \n\nmyapp: myapp.o \n\t$(CC) $(LDFLAGS) $< -o $@ \n\nmyapp.o: myapp.c \n\t$(CC) $(CFLAGS) -c $< -o $@ \n\nclean: \n\trm -rf myapp.o myapp \n\n----------------------------- \nmyapp.c shold contain \n\n#include <stdio.h> \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n \n\treturn 0; \n} \n------------------------------------ \n\n", + "expected_results": "be sure that the indentations on the makefile are tabs not spaces. \n\n" + }, + "5": { + "action": " Create the following files within the myapp_cmake directory CMakeLists.txt and myapp.c. Write the following inside each file: \n\n------------------------------------ \nCMakeLists.txt should contain: \n\ncmake_minimum_required (VERSION 2.6) \nproject (myapp) \n# The version number. \nset (myapp_VERSION_MAJOR 1) \nset (myapp_VERSION_MINOR 0) \n\n# add the executable \nadd_executable (myapp myapp.c) \n\ninstall(TARGETS myapp \nRUNTIME DESTINATION bin) \n\n------------------------------------------ \nmyapp.c should contain: \n\n#include \n\nint \nmain(int argc, char *argv[]) \n{ \n\tprintf(\"Hello world\\n\"); \n\n\treturn 0; \n} \n------------------------------------------------- \n\n", + "expected_results": "Be sure that the indentations on CMakeLists.txt is tabs not spaces. \n\n" + }, + "6": { + "action": " source environment-setup-i586-poky-linux \n\n", + "expected_results": "This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n\n" + }, + "7": { + "action": " run command which devtool \n\n", + "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" + }, + "8": { + "action": " devtool add myapp <directory> (this is myapp_cmake dir) \n\n", + "expected_results": "The directory you should input is the myapp_cmake directory. This should automatically create the recipe myapp.bb under <crops-esdk-workdir-workspace>/recipes/myapp/myapp.bb \n\n" + }, + "9": { + "action": " devtool build myapp \n\n", + "expected_results": "This should compile an image \n\n" + }, + "10": { + "action": " devtool reset myapp ", + "expected_results": "This cleans sysroot of the myapp recipe, but it leaves the source tree intact. meaning it does not erase. " + } + }, + "summary": "sdkext_devtool_build_cmake" + } + }, + { + "test": { + "@alias": "crops-default.crops-default.sdkext_extend_autotools_recipe_creation", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 2 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\n\n", + "expected_results": "" + }, + "2": { + "action": "Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": " source environment-setup-i586-poky-linux \n\n", + "expected_results": " This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n\n" + }, + "4": { + "action": "run command which devtool \n\n", + "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" + }, + "5": { + "action": "devtool sdk-install -s libxml2 \n\n", + "expected_results": "this should install libxml2 \n\n" + }, + "6": { + "action": "devtool add librdfa https://github.com/rdfa/librdfa \n\n", + "expected_results": "This should automatically create the recipe librdfa.bb under /recipes/librdfa/librdfa.bb \n\n" + }, + "7": { + "action": "devtool build librdfa \n\n", + "expected_results": "This should compile \n\n" + }, + "8": { + "action": "devtool reset librdfa ", + "expected_results": "This cleans sysroot of the librdfa recipe, but it leaves the source tree intact. meaning it does not erase." + } + }, + "summary": "sdkext_extend_autotools_recipe_creation" + } + }, + { + "test": { + "@alias": "crops-default.crops-default.sdkext_devtool_kernelmodule", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 2 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\n", + "expected_results": "" + }, + "2": { + "action": " Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": "source environment-setup-i586-poky-linux \n\n", + "expected_results": "This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n \n" + }, + "4": { + "action": "run command which devtool \n\n", + "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" + }, + "5": { + "action": "devtool add v4l2loopback-driver https://github.com/umlaeute/v4l2loopback.git \n\n", + "expected_results": "This should automatically create the recipe v4l2loopback-driver.bb under <crops-esdk-workdir-workspace>/recipes/v4l2loopback-driver/v4l2loopback-driver.bb " + }, + "6": { + "action": "devtool build v4l2loopback-driver \n\n", + "expected_results": "This should compile an image \n\n" + }, + "7": { + "action": "devtool reset v4l2loopback-driver ", + "expected_results": "This cleans sysroot of the v4l2loopback-driver recipe, but it leaves the source tree intact. meaning it does not erase." + } + }, + "summary": "sdkext_devtool_kernelmodule" + } + }, + { + "test": { + "@alias": "crops-default.crops-default.sdkext_recipes_for_nodejs", + "author": [ + { + "email": "francisco.j.pedraza.gonzalez@intel.com", + "name": "francisco.j.pedraza.gonzalez@intel.com" + } + ], + "execution": { + "1": { + "action": "IMPORTANT NOTE: The firsts 2 steps refer to configuration of the environment to run the rest of the steps. These only apply for CROPS-eSDK. \n\n\nlets say variable npm = npm://registry.npmjs.org;name=winston;version=2.2.0 \n\n", + "expected_results": "" + }, + "2": { + "action": "Initiate your Crops-esdk environment as it says in wiki https://github.com/crops/docker-win-mac-docs/wiki \n\n", + "expected_results": "" + }, + "3": { + "action": "source environment-setup-i586-poky-linux \n\n", + "expected_results": "This should output a message that says SDK environment now set up; additionally you may now run devtool to perform development tasks etc etc ... \n\n" + }, + "4": { + "action": "run command which devtool \n\n", + "expected_results": "this should output the directory of the devtool script and it should be within the sdk workdir you are working in. \n\n" + }, + "5": { + "action": " 4a) git clone git://git.openembedded.org/meta-openembedded in layers/build directory \n \n4b) Add meta-openembedded/meta-oe in bblayer.conf as mentioned below: ${SDKBASEMETAPATH}/layers/build/meta-openembedded/meta-oe \\ \n\n4c) devtool add \"npm://registry.npmjs.org;name=npm;version=2.2.0\" \n\n", + "expected_results": " This should automatically create the recipe npm.bb under /recipes/npm/npm.bb \n\n" + }, + "6": { + "action": "devtool build npm \n\n", + "expected_results": "This should compile an image \n\n" + }, + "7": { + "action": " devtool reset npm", + "expected_results": "This cleans sysroot of the npm recipe, but it leaves the source tree intact. meaning it does not erase." + } + }, + "summary": "sdkext_recipes_for_nodejs" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/eclipse-plugin.json b/meta/lib/oeqa/manual/eclipse-plugin.json new file mode 100644 index 0000000000..9869150dcf --- /dev/null +++ b/meta/lib/oeqa/manual/eclipse-plugin.json @@ -0,0 +1,322 @@ +[ + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.support_SSH_connection_to_Target", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "In Eclipse, swich to Remote System Explorer to create a connention baseed on SSH, input the remote target IP address as the Host name, make sure disable the proxy in Window->Preferences->General->Network Connection, set Direct as Active Provider field. ", + "expected_results": "the connection based on SSH could be set up." + }, + "2": { + "action": "Configure connection from Eclipse: Run->Run Configurations->C/C++ Remote Application\\ ->New Connection->General->SSH Only ", + "expected_results": "" + }, + "3": { + "action": "Then right click to connect, input the user ID and password. ", + "expected_results": "" + }, + "4": { + "action": "expand the connection, it will show the Sftp Files etc. \nNOTE. Might need to change dropbear to openssh and add the packagegroup-core-eclipse-debug recipe", + "expected_results": "" + } + }, + "summary": "support_SSH_connection_to_Target" + } + }, + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.Launch_QEMU_from_Eclipse", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Set the Yocto ADT's toolchain root location, sysroot location and kernel, in the menu Window -> Preferences -> Yocto ADT. \n \n", + "expected_results": "" + }, + "2": { + "action": "wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/qemu (ex:core-image-sato-sdk-qemux86-date-rootfs-tar-bz2) \nsource /opt/poky/version/environment-setup-i585-poky-linux \n\nExtract qemu with runqemu-extract-sdk /home/user/file(ex.core-image-sato-sdk-qemux86.bz2) \n/home/user/qemux86-sato-sdk \n\n", + "expected_results": " Qemu can be lauched normally." + }, + "3": { + "action": "(a)Point to the Toolchain: \n \nIf you are using a stand-alone pre-built toolchain, you should be pointing to the /opt/poky/{test-version} directory as Toolchain Root Location. This is the default location for toolchains installed by the ADT Installer or by hand. If ADT is installed in other location, use that location as Toolchain location.\nIf you are using a system-derived toolchain, the path you provide for the Toolchain Root Location field is the Yocto Project's build directory. \n \n E.g:/home/user/yocto/poky/build \n", + "expected_results": "" + }, + "4": { + "action": "(b)Specify the Sysroot Location: \nSysroot Location is the location where the root filesystem for the target hardware is created on the development system by the ADT Installer (SYSROOT in step 2 of the case ADT installer Installation). \n \n Local : e.g: /home/user/qemux86-sato-sdk \nUsing ADT : e.g :/home/user/test-yocto/qemux86 \n\n", + "expected_results": "" + }, + "5": { + "action": "(c)Select the Target Architecture: \n \nThe target architecture is the type of hardware you are going to use or emulate. Use the pull-down Target Architecture menu to make your selection. \n \n\n", + "expected_results": "" + }, + "6": { + "action": "(d) QEMU: \nSelect this option if you will be using the QEMU emulator. Specify the Kernel matching the QEMU architecture you are using. \n wget autobuilder.yoctoproject.org/pub/releases//machines/qemu/qemux86/bzImage-qemux86.bin \n e.g: /home/$USER/yocto/adt-installer/download_image/bzImage-qemux86.bin \n\n", + "expected_results": "" + }, + "7": { + "action": "(e) select OK to save the settings. \n\n\n1: In the Eclipse toolbar, expose the Run -> External Tools menu. Your image should appear as a selectable menu item. \n2: Select your image in the navigation pane to launch the emulator in a new window. \n3: If needed, enter your host root password in the shell window at the prompt. This sets up a Tap 0 connection needed for running in user-space NFS mode. \n", + "expected_results": "" + } + }, + "summary": "Launch_QEMU_from_Eclipse" + } + }, + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.Relocatable_SDK_-_C_-_Build_Hello_World_ANSI_C_Autotools_Project", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "expected_results": "" + }, + "2": { + "action": "Select File -> New -> Project.", + "expected_results": "" + }, + "3": { + "action": "Double click C/C++.", + "expected_results": "" + }, + "4": { + "action": "Click C or C++ Project to create the project.", + "expected_results": "" + }, + "5": { + "action": "Expand Yocto ADT Project.", + "expected_results": "" + }, + "6": { + "action": "Select Hello World ANSI C Autotools Project.", + "expected_results": "" + }, + "7": { + "action": "Put a name in the Project name. Do not use hyphens as part of the name. \n \n", + "expected_results": "" + }, + "8": { + "action": "Click Next.", + "expected_results": "" + }, + "9": { + "action": "Add information in the Author and Copyright notice fields. \n1", + "expected_results": "" + }, + "10": { + "action": "Click Finish. \n1", + "expected_results": "" + }, + "11": { + "action": "If the \"open perspective\" prompt appears, click \"Yes\" so that you open the C/C++ perspective. \n1", + "expected_results": "" + }, + "12": { + "action": "In the Project Explorer window, right click the project -> Reconfigure project. \n1", + "expected_results": "" + }, + "13": { + "action": "In the Project Explorer window, right click the project -> Build project. \n1", + "expected_results": "Under the Project files, a new folder appears called Binaries. This indicates that the compilation have been successful and the project binary have been created. \n" + }, + "14": { + "action": "Right click it again and Run as -> Run Configurations. \n\t\t\tUnder Run Configurations expand \"C/C++ Remote Application\". A configuration for the current project should appear. Clicking it will display the configuration settings. \n\t\t\tin \"C/C++ Application\" field input Remote Absolute File path for C/C++ Application. e.g.: /home/root/myapplication \n\t\t\tIn \"Connection\" drop-down list make sure a TCF connection is set up for your target. If not, create a new one by clicking the New button. \n1", + "expected_results": "step 14 to step 16 -> Build succeed and the console outputs Hello world, you can also check the output on target." + }, + "15": { + "action": "After all settings are done, select the Run button on the bottom right corner \n\n1", + "expected_results": "" + }, + "16": { + "action": "Repeat the steps 14-15, but instead of using Run Configurations use Debug Configurations: \nRight click it again and Debug as -> Debug Configurations \nUnder Debug Configurations expand \"C/C++ Remote Application\". A configuration for the current project should appear. Clicking it will display the configuration settings. \nin \"C/C++ Application\" field input Remote Absolute File path for C/C++ Application.\ne.g.: /home/root/myapplication \nIn \"Connection\" drop-down list make sure a TCF connection is set up for your target. If not, create a new one by clicking the New button \n1", + "expected_results": "" + }, + "17": { + "action": "After all settings are done, select the Debug button on the bottom right corner", + "expected_results": "" + } + }, + "summary": "Relocatable_SDK_-_C_-_Build_Hello_World_ANSI_C_Autotools_Project" + } + }, + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.Relocatable_SDK_-_C++_-_Build_Hello_World_C++_Autotools_project", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Launch a QEMU of target enviroment.(Reference to case \"ADT - Launch qemu by eclipse\") ", + "expected_results": "" + }, + "2": { + "action": "Select File -> New -> Project. ", + "expected_results": "" + }, + "3": { + "action": "Double click C/C++. ", + "expected_results": "" + }, + "4": { + "action": "Click C or C++ Project to create the project. ", + "expected_results": "" + }, + "5": { + "action": "Expand Yocto ADT Project. ", + "expected_results": "" + }, + "6": { + "action": "Select Hello World ANSI C++ Autotools Project. ", + "expected_results": "" + }, + "7": { + "action": "Put a name in the Project name. Do not use hyphens as part of the name. \n \n", + "expected_results": "" + }, + "8": { + "action": "Click Next.", + "expected_results": "" + }, + "9": { + "action": "Add information in the Author and Copyright notice fields.", + "expected_results": "" + }, + "10": { + "action": "Click Finish. \n1", + "expected_results": "" + }, + "11": { + "action": "If the \"open perspective\" prompt appears, click \"Yes\" so that you open the C/C++ perspective. \n1", + "expected_results": "" + }, + "12": { + "action": "In the Project Explorer window, right click the project -> Reconfigure project. \n1", + "expected_results": "" + }, + "13": { + "action": "In the Project Explorer window, right click the project -> Build project. \n\n1", + "expected_results": "under the Project files, a new folder appears called Binaries. This indicates that the compilation have been successful and the project binary have been created. \n" + }, + "14": { + "action": "Right click it again and Run as -> Run Configurations. \n\t\t\tUnder Run Configurations expand \"C/C++ Remote Application\". A configuration for the current project should appear. Clicking it will display the configuration settings. \n\t\t\tin \"C/C++ Application\" field input Remote Absolute File path for C/C++ Application. e.g.: /home/root/myapplication \n\t\t\tIn \"Connection\" drop-down list make sure a TCF connection is set up for your target. If not, create a new one by clicking the New button. \n1", + "expected_results": "step 14 to step 16 -> Build succeed and the console outputs Hello world, you can also check the output on target." + }, + "15": { + "action": "After all settings are done, select the Run button on the bottom right corner \n\n1", + "expected_results": "" + }, + "16": { + "action": "Repeat the steps 14-15, but instead of using Run Configurations use Debug Configurations: \n\t\tRight click it again and Debug as -> Debug Configurations \n\t\tUnder Debug Configurations expand \"C/C++ Remote Application\". A configuration for the current project should appear. Clicking it will display the configuration settings. \n\t\tin \"C/C++ Application\" field input Remote Absolute File path for C/C++ Application. \n\t\te.g.: /home/root/myapplication \n\t\tIn \"Connection\" drop-down list make sure a TCF connection is set up for your target. If not, create a new one by clicking the New button \n1", + "expected_results": "" + }, + "17": { + "action": "After all settings are done, select the Debug button on the bottom right corner", + "expected_results": "" + } + }, + "summary": "Relocatable_SDK_-_C++_-_Build_Hello_World_C++_Autotools_project" + } + }, + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.Build_Eclipse_Plugin_from_source", + "author": [ + { + "email": "laurentiu.serban@intel.com", + "name": "laurentiu.serban@intel.com" + } + ], + "execution": { + "1": { + "action": "Clone eclipse-poky source. \n \n - git clone git://git.yoctoproject.org/eclipse-poky \n\n", + "expected_results": "Eclipse plugin is successfully installed \n\nDocumentation is there. For example if you have release yocto-2.0.1 you will found on http://autobuilder.yoctoproject.org/pub/releases/yocto-2.0.1/eclipse-plugin/mars/ archive with documentation like org.yocto.doc-development-$date.zip \n \n" + }, + "2": { + "action": "Checkout correct tag. \n\n - git checkout <eclipse-version>/<yocto-version> \n\n", + "expected_results": "After plugin is build you must have 4 archive in foder scripts from eclipse-poky: \n - org.yocto.bc - mars-master-$date.zip \n - org.yocto.doc - mars-master-$date.zip --> documentation \n - org.yocto.sdk - mars-master-$date.zip \n - org.yocto.sdk - mars-master-$date.-archive.zip --> plugin " + }, + "3": { + "action": "Move to scripts/ folder. \n\n", + "expected_results": "" + }, + "4": { + "action": "Run ./setup.sh \n\n", + "expected_results": "" + }, + "5": { + "action": "When the script finishes, it prompts a command to issue to build the plugin. It should look similar to the following: \n\n$ ECLIPSE_HOME=/eclipse-poky/scripts/eclipse ./build.sh /&1 | tee -a build.log \n\nHere, the three arguments to the build script are tag name, branch for documentation and release name. \n\n", + "expected_results": "" + }, + "6": { + "action": "On an eclipse without the Yocto Plugin, select \"Install New Software\" from Help pull-down menu \n\n", + "expected_results": "" + }, + "7": { + "action": "Select Add and from the dialog choose Archive... Look for the *archive.zip file that was built previously with the build.sh script. Click OK. \n\n", + "expected_results": "" + }, + "8": { + "action": "Select all components and proceed with Installation of plugin. Restarting eclipse might be required.\n", + "expected_results": "" + } + }, + "summary": "Build_Eclipse_Plugin_from_source" + } + }, + { + "test": { + "@alias": "eclipse-plugin.eclipse-plugin.Eclipse_Poky_installation_and_setup", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Install SDK \n\ta)Download https://autobuilder.yocto.io/pub/releases//toolchain/x86_64/poky-glibc-x86_64-core-\timage-sato-i586-toolchain-.sh \n\tb)Run the SDK installer and accept the default installation directory ", + "expected_results": "" + }, + "2": { + "action": "Install \"Eclipse IDE for C/C++ Developers\" Oxygen release (4.7.0) \n\ta) Go to https://www.eclipse.org/downloads/packages/all, click \"Oxygen R\" \n\tb) Click to download the build for your OS \n\tc) Click \"Download\" button to download from a mirror \n\td) Run \"tar xf\" to extract the downloaded archive ", + "expected_result": "" + }, + "3": { + "action": "Install \"Eclipse IDE for C/C++ Developers\" Oxygen release (4.7.0) (Continue) \n\te) Run \"eclipse/eclipse\" to start Eclipse \n\tf) Optional step for host machine within Intel network: In Eclipse workbench window, go to \"Window\" menu -> \"Preferences...\". \n\tg) In \"Preferences\" dialog, go to \"General\" -> \"Network Connections\", set \"Active Provider\" to \"Manual\". In \"Proxy \tentries\" table, select HTTP and click \"Edit\" and enter host \"proxy-chain.intel.com\" port 911, click OK. Repeat for HTTPS with port 912 \nClick OK to close \"Preferences\" dialog. \n\th) Go to \"File\" menu -> \"Restart\" to restart Eclipse for proxy settings to take effect. ", + "expected_result": "" + }, + "4": { + "action": "Install Eclipse Poky plugins \n\ta) Download https://autobuilder.yocto.io/pub/releases/<yocto-version>/eclipse-plugin/<eclipse-version>/org.yocto.sdk-development-<date>-archive.zip \n\tb) In Eclipse workbench window, go to \"Help\" menu -> \"Install New Software...\" \n\tc) In \"Install\" dialog, click \"Add...\" button \n\td) In \"Add Repository\" dialog, enter \"Eclipse Poky\" for (repository) Name, click \"Archive...\" ", + "expected_results": "" + }, + "5": { + "action": "Install Eclipse Poky plugins (continue) \n\te) In \"Repository archive\" browse dialog, select the downloaded Eclipse Poky repository archive \n\tf) Back in \"Add Repository\" dialog, click \"OK\" \n\tg) Back in \"Install\" dialog, make sure \"Work with:\" is set to \"Eclipse Poky\" repository, tick \"Yocto Project \tDocumentation Plug-in\" and \"Yocto Project SDK Plug-in\", click \"Next >\" and verify plugins/features name/version, \tclick \"Next >\" and accept license agreement, click \"Finish\" \n\th) If \"Security Warning\" dialog appears, click \"OK\" to install unsigned content. \n\ti) In \"Software Updates\" dialog, click \"Yes\" to restart Eclipse to complete Eclipse Poky plugins installation. ", + "expected_results": "" + }, + "6": { + "action": "Setup Eclipse Poky to use SDK \n\ta) In Eclipse workbench window, go to \"Window\" menu -> \"Preferences\". \n\tb) In \"Preferences\" window, go to \"Yocto Project SDK\", in \"Cross Compiler Options\" frame, select \"Standalone pre-\tbuilt toolchain\". ", + "expected_results": "Eclipse Poky plugins installed and running successfully, e.g. observe that \"Yocto Project Tools\" menu is available on Eclipse workbench window." + } + }, + "summary": "Eclipse_Poky_installation_and_setup" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/kernel-dev.json b/meta/lib/oeqa/manual/kernel-dev.json new file mode 100644 index 0000000000..0dd99199dc --- /dev/null +++ b/meta/lib/oeqa/manual/kernel-dev.json @@ -0,0 +1,200 @@ +[ + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_defconfig", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_7 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_7", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_7" + } + }, + "summary": "Kernel_dev_defconfig" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_defconfig+fragments", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_8 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_8", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_8" + } + }, + "summary": "Kernel_dev_defconfig+fragments" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_Applying_patches", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results" + } + }, + "summary": "Kernel_dev_Applying_patches" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_linux-yocto-local-source", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_2 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_2", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_2" + } + }, + "summary": "Kernel_dev_linux-yocto-local-source" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_linux-yocto-custom-local-source", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_3 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_3", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_3" + } + }, + "summary": "Kernel_dev_linux-yocto-custom-local-source" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_recipe-space_meta", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_5 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_5", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_5" + } + }, + "summary": "Kernel_dev_recipe-space_meta" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_External_source", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_6 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_6", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_6" + } + }, + "summary": "Kernel_dev_External_source" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_building_external_modules(hello-mod)", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_10 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup_10", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_10" + } + }, + "summary": "Kernel_dev_building_external_modules(hello-mod)" + } + }, + { + "test": { + "@alias": "kernel-dev.kernel-dev.Kernel_dev_local_parallel_meta", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Follow the Set Up procedure to complete the common and specific prerequisites for this test case. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Setup https://wikioproject.org/wiki/Kernel_Development_Test_Cases#Prerequisites_4 ", + "expected_results": "" + }, + "2": { + "action": "Execute the test case steps asdocumented on the \"Kernel Development Test Cases\" wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Steps_4", + "expected_results": "Review expected results on thethe \"Kernel Development Test Cases\"wiki. https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases#Expected_Results_4" + } + }, + "summary": "Kernel_dev_local_parallel_meta" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/oe-core.json b/meta/lib/oeqa/manual/oe-core.json new file mode 100644 index 0000000000..0e8f01a912 --- /dev/null +++ b/meta/lib/oeqa/manual/oe-core.json @@ -0,0 +1,264 @@ +[ + { + "test": { + "@alias": "oe-core.scripts.Use_scripts/pybootchartgui/pybootchartgui.py_to_generate_build_profiles", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Run a build for a recipe (e.g. core-image-minimal)", + "expected_results": "" + }, + "2": { + "action": "Run the profiling script, ../scripts/pybootchartgui/pybootchartgui.py tmp/buildstats/ \n\n", + "expected_results": "" + }, + "3": { + "action": "Verify the results ", + "expected_results": "The scripts generates svg files with the profiling results . " + } + }, + "summary": "Use_scripts/pybootchartgui/pybootchartgui.py_to_generate_build_profiles" + } + }, + { + "test": { + "@alias": "oe-core.scripts.Crosstap_script_check", + "author": [ + { + "email": "alexandru.c.georgescu@intel.com", + "name": "alexandru.c.georgescu@intel.com" + } + ], + "execution": { + "1": { + "action": "Create the trace_open.stp script as follows in the host machine: \n\n\nprobe syscall.open \n\n{ \n\n\n printf (\"%s(%d) open (%s)\\n\", execname(), pid(), argstr) \n\n} \n\n\n\nif the above failed, then create the below instead. \n\nprobe syscall.open \n{ \n printf (\"%s(%d) open\\n\", execname(), pid()) \n\n} \n \n", + "expected_results": "" + }, + "2": { + "action": "Add 'tools-profile' and 'ssh-server-openssh' to EXTRA_IMAGE_FEATURES in local.conf \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Build a core-image-minimal image, build systemtap-native. Start the image under qemu. \n\n", + "expected_results": "" + }, + "4": { + "action": "Make sure that the ssh service is started on the Qemu machine. \n\n", + "expected_results": "" + }, + "5": { + "action": "From the host machine poky build_dir, run \"crosstap root@192.168.7.2 trace_open.stp\".", + "expected_results": "" + }, + "6": { + "action": "In QEMU, try to open some applications, such as open a terminal, input some command, \n\n", + "expected_results": "" + }, + "7": { + "action": "Check the host machine, \"crosstap\" has related output. \n\n\n\nNOTE: Do not build the kernel from shared state(sstate-cache) for this to work.", + "expected_results": "The script should successfully connect to the qemu machine and there \nshould be presented a list of services(pid, process name) which run on \nthe qemu machine. " + } + }, + "summary": "Crosstap_script_check" + } + }, + { + "test": { + "@alias": "oe-core.scripts.List_all_the_PACKAGECONFIG's_flags", + "author": [ + { + "email": "yi.zhao@windriver.com", + "name": "yi.zhao@windriver.com" + } + ], + "execution": { + "1": { + "action": " Download the poky source and setup the environment. ", + "expected_results": "" + }, + "2": { + "action": "Run \"../scripts/contrib/list-packageconfig-flags.py\" ", + "expected_results": "In step 2, will list available pkgs which have PACKAGECONFIG flags: \nPACKAGE NAME (or RECIPE NAME) PACKAGECONFIG FLAGS \n============================================================== \nalsa-tools-1.0.26.1 defaultval gtk+ \navahi-ui-0.6.31 defaultval python \nbluez4-4.101 alsa defaultval pie \n" + }, + "3": { + "action": "Run \"../scripts/contrib/list-packageconfig-flags.py -f\" ", + "expected_results": "In step 3, will list available PACKAGECONFIG flags and all affected pkgs \nPACKAGECONFIG FLAG PACKAGE NAMES (or RECIPE NAMES) \n==================================== \n3g connman-1.16 \n \navahi cups-1.6.3 pulseaudio-4.0 \nbeecrypt rpm-5.4.9 rpm-native-5.4.9 \n" + }, + "4": { + "action": "Run \"../scripts/contrib/list-packageconfig-flags.py -a\" ", + "expected_results": "In step 4, will list all pkgs and PACKAGECONFIG information: \n================================================== \ngtk+-2.24.18 \n/home/jiahongxu/yocto/poky/meta/recipes-gnome/gtk+/gtk+_2.24.18.bb \nPACKAGECONFIG x11 \nPACKAGECONFIG[x11] --with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS} \nxf86-video-intel-2.21.9 \n/home/jiahongxu/yocto/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb \nPACKAGECONFIG None \nPACKAGECONFIG[xvmc] --enable-xvmc,--disable-xvmc,libxvmc \nPACKAGECONFIG[sna] --enable-sna,--disable-sna \n" + }, + "5": { + "action": "Run \"../scripts/contrib/list-packageconfig-flags.py -p\" ", + "expected_results": "In step 5, will list pkgs with preferred version: \nPACKAGE NAME (or RECIPE NAME) PACKAGECONFIG FLAGS \n=================================================== \nalsa-tools-1.0.26.1 defaultval gtk+ \navahi-ui-0.6.31 defaultval python \nbluez4-4.101 alsa defaultval pie \nbluez5-5.7 alsa defaultval obex-profiles \n\n\n\n " + } + }, + "summary": "List_all_the_PACKAGECONFIG's_flags" + } + }, + { + "test": { + "@alias": "oe-core.bitbake.Test_bitbake_menuconfig", + "author": [ + { + "email": "jose.perez.carranza@intel.com", + "name": "jose.perez.carranza@intel.com" + } + ], + "execution": { + "1": { + "action": "clone poky \n \n", + "expected_results": "" + }, + "2": { + "action": "cd poky \n\n", + "expected_results": "" + }, + "3": { + "action": "source oe-init-build-env && cd build \n\n", + "expected_results": "" + }, + "4": { + "action": "set below in local.conf \n\n \tMACHINE = \"qemux86\" \n\n", + "expected_results": "" + }, + "5": { + "action": "bitbake linux-yocto -c kernel_configme -f \n\n", + "expected_results": "" + }, + "6": { + "action": "bitbake linux-yocto -c menuconfig \n\n", + "expected_results": "" + }, + "7": { + "action": "Once menuconfig launches, use the interface to navigate through the selections and \n enable option \"64-bit kernel\" \n\n", + "expected_results": "" + }, + "8": { + "action": "Save changes and set name of the file as \"test.config\" ", + "expected_results": "Open file: \n \npoky/build//tmp/work/qemux86-poky-linux/linux-yocto/4.X.X+*/linux-qemux86-standard-build/test.config \n \n \n\nand verify that changes are present in the file as follows: \n \nCONFIG_64BIT=y \n \nCONFIG_X86_64=y" + } + }, + "summary": "Test_bitbake_menuconfig" + } + }, + { + "test": { + "@alias": "oe-core.bitbake.test_bitbake_devshell", + "author": [ + { + "email": "jose.perez.carranza@intel.com", + "name": "jose.perez.carranza@intel.com" + } + ], + "execution": { + "1": { + "action": "clone poky ", + "expected_results": "" + }, + "2": { + "action": "cd poky ", + "expected_results": "" + }, + "3": { + "action": "source oe-init-build-env && cd build ", + "expected_results": "" + }, + "4": { + "action": "bitbake matchbox-desktop ", + "expected_results": "Package was build correctly " + }, + "5": { + "action": "bitbake matchbox-desktop -c devshell ", + "expected_results": "A terminal with a shell prompt within the OpenEmbedded build environment is opened " + }, + "6": { + "action": "Verify that \"matchbox-desktop\" binary file is not created under\"src\" directory ", + "expected_results": "" + }, + "7": { + "action": "Run command:./configure && make ", + "expected_results": "Verify that \"matchbox-desktop\" binary file was created successfully under \"src/\" directory " + }, + "8": { + "action": "Exit fromthe devshell terminal,exit ", + "expected_results": "Terminal back to the build directory" + } + }, + "summary": "test_bitbake_devshell" + } + }, + { + "test": { + "@alias": "oe-core.bitbake.test_dependency_explorer_is_launched", + "author": [ + { + "email": "jose.perez.carranza@intel.com", + "name": "jose.perez.carranza@intel.com" + } + ], + "execution": { + "1": { + "action": "clone poky ", + "expected_results": "" + }, + "2": { + "action": "cd poky ", + "expected_results": "" + }, + "3": { + "action": "source oe-init-build-env ", + "expected_results": "" + }, + "4": { + "action": "bitbake core-image-full-cmdline \n", + "expected_results": "Image should be successfully built \n" + }, + "5": { + "action": "bitbake -u taskexp -g core-image-full-cmdline \n\nNOTE: To execute the last command of this test, it's necessary that the machine is executing an X11 server, or if that's not the case (for example, if running the test on a headless server), it is required to enable ssh X11 forwarding on both, the server and the client, and have the X11 server running on the client. \n\nThe instructions to enable X11 forwarding vary between distributions. But for example, these are the steps to enable it between a server running openSUSE Leap 42.1 and a client with Fedora 24: \nA. On the server, make sure /home//.ssh/config contains the line: \n ForwardX11 yes \nB. On the server, make sure xauth is installed by running: \n which xauth \nC. On the client, connect to the server, enabling X11 forwarding, for example by using: \n ssh -X user@server \nNOTE 2: depexp was renamed to taskexp on 2.3 M4", + "expected_results": "Verify that a \"dependency explorer\" is opened and file \n dependencies are listed " + } + }, + "summary": "test_dependency_explorer_is_launched" + } + }, + { + "test": { + "@alias": "oe-core.bitbake.test_bitbake_sane_error_for_invalid_layer", + "author": [ + { + "email": "jose.perez.carranza@intel.com", + "name": "jose.perez.carranza@intel.com" + } + ], + "execution": { + "1": { + "action": "clone poky \n", + "expected_results": "" + }, + "2": { + "action": "cd poky \n \n", + "expected_results": "" + }, + "3": { + "action": "source oe-init-build-env && cd build \n \n", + "expected_results": "" + }, + "4": { + "action": "Add a invalid layer to conf/bblayers.conf \"<poky dir>/my-invalid-layer\" \n\t\n", + "expected_results": "" + }, + "5": { + "action": "bitbake core-image-minimal", + "expected_results": "Below error should be displayed:\n\"ERROR: Layer directory does not exist! Please check BBLAYERS in <poky dir>/<build dir>/conf/bblayers.conf\"" + } + }, + "summary": "test_bitbake_sane_error_for_invalid_layer" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/sdk.json b/meta/lib/oeqa/manual/sdk.json new file mode 100644 index 0000000000..434982f7f5 --- /dev/null +++ b/meta/lib/oeqa/manual/sdk.json @@ -0,0 +1,32 @@ +[ + { + "test": { + "@alias": "sdk.sdk_runqemu.test_install_cross_toolchain_can_run_multiple_qemu_for_x86", + "author": [ + { + "email": "ee.peng.yeoh@intel.com", + "name": "ee.peng.yeoh@intel.com" + } + ], + "execution": { + "1": { + "action": "Prepare kernel, rootfs tar.bz2 image, and qemu configuration \n \ta. Download kernel, rootfs tar.bz2 image and qemu configuration from public autobuilder webpage \n \tb. Goto https://autobuilder.yocto.io/pub/releases/<target_release>/machines/qemu/qemux86/ \n \tc. Download \n \t \ti. rootfs tar.bz2: core-image-sato-sdk-qemux86.tar.bz2 \n \t\tii. kernel: bzImage-qemux86.bin \n \t\tiii. qemu configuration: core-image-sato-sdk-qemux86.qemuboot.conf ", + "expected_results": "Download completes successfully." + }, + "2": { + "action": "Download & install toolchain tarball matching your host from public autobuilder \n \ta. Goto https://autobuilder.yocto.io/pub/releases/<target_release>/toolchain/x86_64/ \n \tb. Download poky-glibc-x86_64-core-image-sato-<type-arch>-toolchain-<release-version>.sh \n \tc. Run command: poky-glibc-x86_64-core-image-sato-<type-arch>-toolchain-<release-version>.sh \n \td. After installation toolchain Run source command : source /toolchain-installed-path/environment-setup-<architecture name>-poky-linux", + "expected_results": "Toolchain gets installed successfully." + }, + "3": { + "action": "Extract rootfs twice into two images \n \ta. Run 2 commands below: \n runqemu-extract-sdk core-image-sato-sdk-qemux86.tar.bz2 qemux86_rootfs_image1 \n runqemu-extract-sdk core-image-sato-sdk-qemux86.tar.bz2 qemux86_rootfs_image2", + "expected_results": "Both images build successfully." + }, + "4": { + "action": " From the 2 terminals, start qemu to boot up both two images \n \ta. Run 2 commands below: \n runqemu <kernel-name> core-image-sato-sdk-qemux86.qemuboot.conf qemux86_rootfs_image1 \n runqemu <kernel-name> core-image-sato-sdk-qemux86.qemuboot.conf qemux86_rootfs_image2 ", + "expected_results": "Expect both qemu to boot up successfully." + } + }, + "summary": "test_install_cross_toolchain_can_run_multiple_qemu_for_x86" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/toaster-managed-mode.json b/meta/lib/oeqa/manual/toaster-managed-mode.json new file mode 100644 index 0000000000..812f57da34 --- /dev/null +++ b/meta/lib/oeqa/manual/toaster-managed-mode.json @@ -0,0 +1,2572 @@ +[ + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.All_layers:_default_view", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table.", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"View compatible layers\" link situated on the right-hand side, mid-page, under the \"Project configuration\" menu, in the \"Layers\" table.", + "expected_results": "" + }, + "3": { + "action": "Check that the table is populated with the default layers (eg. meta-yocto-bsp, meta-yocto)", + "expected_results": "" + }, + "4": { + "action": "Check that by default the following columns are shown: Layer, Summary, Revision, Dependencies and Add/Delete", + "expected_results": "" + }, + "5": { + "action": "Check that the \"Revision\" entries match the release entry from the main project page, in the project details section.", + "expected_results": "" + }, + "6": { + "action": "Check that only one instance of the core layers (openembedded-core, meta-yocto and meta-yocto-bsp) shows in this table, and that instance has a branch that matches the selected project release from the main project page.", + "expected_results": "" + }, + "7": { + "action": "Check that in the \"Dependencies\" column some of the layers should have a square box with a number in it. When clicking on it, a small popup should appear containing a list of other layers required for this layer to work. Every layer listed here should also be a link to the layer's detail page. \n \n", + "expected_results": "" + }, + "8": { + "action": "From the \"Edit columns\" menu, activate the \"Git repository URL\" and the \"Subdirectory\" columns. In \"Git repository URL\": all the entries should have a link to the external site where the layer was downloaded from. Similarly, in \"Subdirectory\" links should exist, if a subdirectory entry is present.", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "All_layers:_default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.All_layers:_Add/delete_layers", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"View compatible layers\" link situated on the right-hand side, mid-page, under the \"Project configuration\" menus, in the \"Layers\" table. \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the Add/delete column is enabled. \n\n", + "expected_results": "" + }, + "4": { + "action": "Add a new layer \nPick a layer that hasn't been added to the project. \n \nClick on the \"Add layer\" button present in the \"Add/delete\" column. \nIf the layer has unsatisfied dependencies a dialog will appear listing the dependencies (in alphabetical order), each of them with a checkbox so that you can select / deselect them. All checkboxes are checked by default. If you click the \"Cancel\" button the dialog closes. If you click the \"Add layers\" button, the layers are added to the project. \n\nMake sure to uncheck at least 1 of the dependencies so you can check that only the checked dependencies are added, and not the unchecked one(s). ", + "expected_results": "" + }, + "5": { + "action": "Check that the \"Add layer\" button fades out and is replaced temporarily by a message like \"1 layer added\" and then it is replaced by the \"Delete layer\" button. \nCheck that a confirmation message is displayed at the top of the page similar to \"You have added 1 layer to project_name_here: meta-yocto-bsp\". \n\n", + "expected_results": "" + }, + "6": { + "action": "Delete an existing layer \nPick a layer that's already been added to the project. \nClick on the \"Delete layer\" button present in the \"Add/delete\" column. \nCheck that once the button is pressed, it fades out and is replaced temporarily by the message \"1 layer deleted\" and then it is replaced by the \"Add layer\" button. \nCheck that a confirmation is displayed at the top of the page similar to \"You have deleted 1 layer from project_name_here: meta-yocto-bsp\". ", + "expected_results": "All actions should complete successfully." + } + }, + "summary": "All_layers:_Add/delete_layers" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.All_targets:_Default_view", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": " If no images exist in the project, build an image by inserting \"core-image-minimal\" in the \"Recipes\" field and press the \"Build\" button. Wait for the image to finish building. \n\n", + "expected_results": "" + }, + "3": { + "action": "On the project page click on the \"Image Recipes\" link situated in the left-handed side of the page, under the \"Project configuration\" menus, in the \"COMPATIBLE METADATA\" table. \n\n", + "expected_results": "" + }, + "4": { + "action": "Check that \"Compatible image recipes\" table is populated. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that the following columns are shown by default: \n\t\tImage recipe \n\t\tDescription \n \n\t\tLayer \n\t\tBuild \n\t\t Version ", + "expected_results": "" + } + }, + "summary": "All_targets:_Default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Configuration_variables:_default_view", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "In the main project page, click on \"BitBake variables\" in the left-hand side of the page, under the \"CONFIGURATION\" menu. \n\n", + "expected_results": "" + }, + "3": { + "action": "Check that default values are as follows: \n\tDISTRO - poky \n\tIMAGE_FSTYPES - ext3 jffs2 tar.bz2 \n\tIMAGE_INSTALL_append - \"Not set\" \n\tPACKAGE_CLASES - package_rpm \n SSTATE_DIR - /homeDirectory/poky/sstate-cache \n\n", + "expected_results": "" + }, + "4": { + "action": "Check that under the \"Add variable\" section, the \"Variable\" field has the default text \"Type variable name\" present, the \"Value\" field has the default text \"Type variable value\" present and that the \"Add variable\" button is inactive. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that under the \"Add variable\" section, there is text present that describes the variables that Toaster cannot modify. ", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Configuration_variables:_default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Configuration_variables:_Test_UI_elements", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "In the main project page, click on \"BitBake variables\" in the left-hand side of the page, under the \"CONFIGURATION\" menu. \n\n", + "expected_results": "" + }, + "3": { + "action": "DISTRO: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes an editable text field, populated with the current value of the variable \n\t- check that, if you delete the content of the text field, the save button is disabled \n\t- enter a distro name containing spaces (for example, \"poky tiny\") - check that an error message is shown explaining that the value entered cannot contain spaces \n\n", + "expected_results": "" + }, + "4": { + "action": "IMAGE_FSTYPES: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes editable like so: the main input control is a set of checkboxes. There is a checkbox for each supported image type. The checkboxes are listed in ascending alphabetical order, broken down in 2 groups: \n\t\t", + "expected_results": "" + }, + "5": { + "action": "The selected types are checked and listed at the top \n\t\t", + "expected_results": "" + }, + "6": { + "action": "The other types are not checked and listed afterwards \n\t- check that all this is inside a scrollable div, and a text field is present above that filters out the content of the div as you type. \n\t- check that if there are no image types matching your typed string, a message is shown notifying you of this: \"No image types found\" \n\t- unselect all checkboxes and check that the save button is disabled and a message is shown: \"You must select at least one image type\" \n\t- select different checkboxes and hit save then make sure that the \tsaved value is consistent with the selected checkboxes \n\n", + "expected_results": "" + }, + "7": { + "action": "IMAGE_INSTALL_append: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes a text field, populated with the current value of the variable. \n\n\t- check that the save button is disabled when the text field is empty \n\t- insert test in the text field (for example \"package1\") and hit save; be aware that there is no input validation for this variable \n\t- check that a new \"delete\" icon(a trashcan) has appeared next to the pen icon \n\t- check that clicking on the trashcan icon resets the value to \"Not set\" and makes the trashcan icon dissapear \n\n", + "expected_results": "" + }, + "8": { + "action": "PACKAGE_CLASSES: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes editable with the following components: \n\t\t", + "expected_results": "" + }, + "9": { + "action": "A dropdown menu with values 'package_dev', 'package_ipk' and 'package_rpm' in this order. The value selected when you enter the editable state matches the first value of the variable (e.g. if the value is set to 'package_dev package_ipk' the value selected is 'package_dev'). \n \n\t\t", + "expected_results": "" + }, + "10": { + "action": "Two checkboxes, showing the 2 unselected values in the dropdown menu. \n\n\t- verify that the checkboxes are checked or unchecked to reflect the variable value (e.g. if the value is set to 'package_dev package_ipk', the 'package_ipk' checkbox is checked, and the 'package_rpm' checkbox is unchecked). \n\n\tBoth checkboxes can be unchecked. The value of the checkboxes changes dynamically as I change the selected value in the dropdown menu. This means that any changes to the dropdown menu should uncheck the checkboxes. \n\n\t- click on save and check that the value selected in the dropdown menu is the first value in the variable, followed by any checked checkboxes. \n\n\n", + "expected_results": "" + }, + "11": { + "action": "Adding variables: \n\t- check that the \"add variable\" form has 2 text fields: one for the variable name and a second one for the variable value, plus an \"add\" button that is disabled until both text fields have some input in them. \n \n\t- check variable name validation: variable names cannot have spaces, and can only include letters, numbers, underscores and dashes; variable names entered cannot match the name of a variable already on the list; variable names cannot match the blacklisted variables mentioned in the text on the right-hand side of the page \n\n\t - check that an error message is shown indicating validation has failed and why once you try to put in the value or click on the \"Add variable\" button ", + "expected_results": "All mentioned elements should be present and functional." + }, + "12": { + "action": "insert a valid combination and click on \"Add variable\"; check that a new variable/value pair is added at the bottom of the variable list and that the text fields in the \"add variable\" form are cleared and the \"add\" button is disabled \n\t- check that the added variable has a \"change\" icon present next to the variable value, and also that a \"delete\" icon is present next to the variable name \n\t- check that clicking the \"change\" icon makes the variable editable in a text field containing the value of the variable \n\t- check that, if you delete the content of the text field, the save button is\tdisabled\n\t- check that clicking on the \"delete\" button causes both the variable name and the variable value to be removed from the variables list", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Configuration_variables:_Test_UI_elements" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Project_builds:_Default_view", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"Builds\" , next to the \"Configuration\" Button. \n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the page heading includes a counter with the number of builds run for the project(eg. \"Project builds (4)\"). \n\n", + "expected_results": "" + }, + "4": { + "action": "Check that the following table heads are visible by default: outcome, completed on, failed tasks, errors, warnings, image files. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that by default the table is sorted by \"Completed on\" in descending order", + "expected_results": "All mentioned elements should be present." + } + }, + "summary": "Project_builds:_Default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Project_builds:_Sorting_the_project_builds_table", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View all project builds\" link situated below the top-most \"Build\" button and text field, next to the \"View all targets\" link \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Verify that, by default, the table is sorted by \"Completed on\" in descending order. \n\n", + "expected_results": "" + }, + "4": { + "action": "Activate all columns from the \"Edit columns\" table. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that the following columns are sortable, both in ascending and descending order: outcome, target, machine, started on, completed on, warning, project \n\n", + "expected_results": "" + }, + "6": { + "action": "Verify that hiding a column that is currently being used as the sorting criteria causes the sorting to reset to the default - i.e \"Completed on\" in descending order.", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Project_builds:_Sorting_the_project_builds_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Project_builds:_customize_the_columns_of_the_table", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View all project builds\" link situated below the top-most \"Build\" button and text field, next to the \"View all targets\" link \n\n", + "expected_results": "" + }, + "3": { + "action": "Click on the \"Edit column\" menu and check that the selected columns match the columns currently being shown. \n\n", + "expected_results": "" + }, + "4": { + "action": "Check that the following columns cannot be removed from the shown columns: completed on, outcome, recipe \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that unchecked items changed to checked immediately appear in the table and that checked items changed to unchecked immediately disappear from the table.", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Project_builds:_customize_the_columns_of_the_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Project_builds:_filter_the_contents_of_the_table", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View all project builds\" link situated below the top-most \"Build\" button and text field, next to the \"View all targets\" link. \n\n", + "expected_results": "" + }, + "3": { + "action": "Make sure the following columns have filters: outcome, started on, completed on, failed tasks. \n\n", + "expected_results": "" + }, + "4": { + "action": "Filters are mutually exclusive. Click a filter button of a one column and a filter dialogue occurs. Select a filter item. The filter result would be showed. Then select another filter item of another column and the previously applied filter is overridden by the newly selected filter when a filter from a different column is applied to the table. This filter will override the current filter.\" \n\n", + "expected_results": "" + }, + "5": { + "action": "Filters are overridden by search. Run a search query and you can see previous filter results are overridden by the results of the search query.", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Project_builds:_filter_the_contents_of_the_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Project_builds:_search_the_contents_of_the_table", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View all project builds\" link situated below the top-most \"Build\" button and text field, next to the \"View all targets\" link. \n\n", + "expected_results": "" + }, + "3": { + "action": "When no search query has been entered, we have placeholder text saying: \"Search builds\". The placeholder text disappears when the first character is typed. \n\n", + "expected_results": "" + }, + "4": { + "action": "When a search query has been submitted and results returned: \n- We keep the search string in the text input field. \n- We provide a \"Clear search\" icon (icon-remove-sign). Click it to clear the search and display all packages. \n- We change the page heading to indicate the number of results returned by the search query. \n\n", + "expected_results": "" + }, + "5": { + "action": "If your search query returns no results, the page heading changes to \"No packages found\", and we show you an alert with a search form and an option to show all packages. \n\n", + "expected_results": "" + }, + "6": { + "action": "Searching does not change the state of the table: the same columns remain hidden and the same sorting applied. ", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Project_builds:_search_the_contents_of_the_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Layer_details_page:_Default_view", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View compatible layers\" link situated in the \"Project configuration\" portion of the page, under \"Layers\" table. \n\n", + "expected_results": "" + }, + "3": { + "action": "Click on a layer (for example \"meta-aarch64\"). Notice that the page is divided into 2 columns: the left one is broken down into tabs; the right one provides information about the layer. \n\n", + "expected_results": "" + }, + "4": { + "action": "Check that breadcrumbs exist at the top of the page. Check that they work by clicking on them, then hitting back to return to the layer detail page. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that the page heading includes the layer branch name - it should look something like meta-aarch64(dizzy) if the dizzy branch was selected. The branch name should also be present in the breadcrumbs. \n\n", + "expected_results": "" + }, + "6": { + "action": "The \"About\" information: \nit shows summary, description in this order, if not empty. If an information item is empty (like the Summary in the example shown in this page), it does not display. \n \n\n", + "expected_results": "" + }, + "7": { + "action": "The tabs: \nCheck that there are 3 tabs: \"layer details\", \"recipes\", \"machines\" showing up in this order. \n\n", + "expected_results": "" + }, + "8": { + "action": "\"Layer details\" tab: \nCheck that the tab shows: \n- A button to add / remove the layer to / from the project. In this tab, the button labels are\"Add the $layer_name layer to your project\" \"Delete the $layer_name layer from your project\" \n- Some details about the layer: repository URL, repository subdirectory, revision (the branch) and the list of layer dependencies. If any of the above details is blank (most likely, the subdirectory) it does not display.The icons next to the repository and subdirectory information are links to their web instances. Those links should open in a new window. \n\n", + "expected_results": "" + }, + "9": { + "action": "The \"Recipes\" tab: \nCheck that it shows: \n\t", + "expected_results": "" + }, + "10": { + "action": "A counter in the tab label showing the total number of targets provided by the layer \n\t", + "expected_results": "" + }, + "11": { + "action": "A button to add / remove the layer to / from the project. In this tab, the button labels are \"Add the $layer_name layer to your project to enable these targets\"/\"Delete the $layer_name layer from your project\" \n\t", + "expected_results": "" + }, + "12": { + "action": "A recipes table with the following columns: \n \n- Recipe \n- Description: the value of the DESCRIPTION variable. If not set, then the value of the SUMMARY variable. \n- Build recipe, which shows a \"build recipe\" button. The \"build recipe\" button is disabled when the layer is not added to the project. \n\nThe recipes table is sorted by \"Recipe\" in ascending alphabetical order. \n\n1", + "expected_results": "" + }, + "13": { + "action": "The \"Machines\" tab: \n\t", + "expected_results": "" + }, + "14": { + "action": "A counter in the tab label showing the total number of machines provided by the layer \n\t", + "expected_results": "" + }, + "15": { + "action": "A button to add/remove the layer to/from the project. In this tab, the button labels are \"Add the $layer_name layer to your project to enable these machines\"/\"Delete the $layer_name layer from your project\" \n\t", + "expected_results": "" + }, + "16": { + "action": "A machines table with the following columns: \n \n- Machine. \n \n- Description: The value of the DESCRIPTION variable in the .conf file \n- Select machine, which shows a \"select\" button. The \"select\" button is disabled when the layer is not added to the project. \nThe machines table is sorted by \"Machine\" in ascending alphabetical order. \n", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Layer_details_page:_Default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Layer_details_page:_UI_functionality", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View compatible layers\" link situated in the \"Project configuration\" portion of the page, under \"Layers\" \n\n", + "expected_results": "" + }, + "3": { + "action": "Click on a layer (for example \"meta-aarch64\"). \n\n", + "expected_results": "" + }, + "4": { + "action": "Adding/removing a layer: \nClick on \"Add the $layer_name_here layer to your project\" and verify that the \"Add layer\" button turns into a red button with the label \"Delete the $layer_name_here layer from your project\" and that at the top of the page, below the header, you see a message \"You have added 1 layer to $project_name_here: $layer_name_here\". This message can be dismissed by clicking on the \"X\" at the top right side of the message. ", + "expected_results": "" + }, + "5": { + "action": "Click on the red \"Delete the $layer_name_here from your project\" button and verify that the \"Delete layer\" button turns back into a grey button with the label \"Add the $layer_name_here to your project\" and that at the top of the page, below the header, you see a message \"You have deleted 1 layer to $project_name_here: $layer_name_here\". This message can be dismissed by clicking on the \"X\" at the top right side of the message. \n\n", + "expected_results": "" + }, + "6": { + "action": "Dependencies window: \n For a layer that has dependencies( for example \"meta-ettus\"), once you click the \"Add layer\" button, verify that you get a message window that presents the dependencies for this layer with the message \"$layer_name_here depends on some layers that are not added to your project. Select the ones you want to add:\", a list with a checkbox for each one and 2 options: \"Add layers\" or \"Cancel\". \nClicking on \"Add layers\" adds all the dependencies and the current layer. Clicking on \"Cancel\" takes you back to the layer detail page without adding any of the layers. \n\n", + "expected_results": "" + }, + "7": { + "action": "\"Recipes\" table \nCheck that if the layer hasn't been added to the project, the \"Build recipe\" button(s) are disabled. After the project is added, check that the \"Build recipe\" button(s) become active and clicking on a button sends you to the main project page and starts a build. \n\n", + "expected_results": "" + }, + "8": { + "action": "\"Machines table\" \nCheck that if the layer hasn't been added to the project, the \"Select machine\" button(s) are disabled. After the project is added, check that the \"Build machine\" button(s) become active and clicking on a button sends you to the main project page and modifies the project machine to the one selected. ", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Layer_details_page:_UI_functionality" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Importing_new_layers", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"Import layer\" link situated in the \"Project configuration\" portion of the page, under \"Layers\" table. \n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the import layer form is shown, with the following elements as text fields to be filled out: \nLayer name (example: meta-imported) \nGit repository URL (example: git://github.com/shr-distribution/meta-smartphone.git) \nRepository subdirectory (optional) (example: meta-acer) \nRevision (example: master) \n\nIn addition, a separate portion of the form will be the \"Layer dependencies\" portion, where you can add dependency layers for the layer you are importing. This portion will contain a list of dependencies already added, with a trashcan icon next to them that will delete them when pressed and a text field with a \"add layer\" button next to it for adding dependencies. (for example: meta-android, meta-oe) \n\n", + "expected_results": "" + }, + "4": { + "action": "At the bottom of the form, check that a button exists with the label \"Import and add to project\". Check that this button is inactive until the required fields are filled out. \nCheck that clicking on the \"Import button\" takes you back to the main project page and that the imported layer, along with any dependencies, were added in the project's layers. ", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Importing_new_layers" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Layer_details_page:_UI_functionality_for_imported_layers", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Click on the \"View compatible layers\" link situated in the \"Project configuration\" portion of the page, under \"Layers\" table. \n\n", + "expected_results": "" + }, + "3": { + "action": "Select an imported layer (see in TC 1112 how to import a layer). \n\n", + "expected_results": "" + }, + "4": { + "action": "Page heading \nCheck that the page heading includes the branch, tag or commit as entered when importing the layer.\nIf it's a commit, Check that only the first 10 characters are shown followed by an ellipsis character. The full commit shows on hover.The branch, tag or commit information also shows in the breadcrumb. \n\n", + "expected_results": "" + }, + "5": { + "action": "The \"About\" information \nIt shows: \n- Summary \n- Description \nin this order. Those two items always show, independently of them being blank or not, since they can be edited by users. \n\nWhen an information item is empty, it shows as \"not set\" with a \"change\" icon. Click on the icon to add a value. \n\nFor \"Summary\" and \"Description\" clicking the \"change\" icon shows the selected information item in its editable state. It consists of a text area, set to 2 rows for the \"Summary\" and to 6 rows for the \"Description\", plus 'save' and 'cancel' buttons. \nThe 'save' buttons only activate when there is at least one character in the text area. \n\n", + "expected_results": "" + }, + "6": { + "action": "The tabs \nCheck that the tabs shown are: \n- \"Layer details\" \n- \"Recipes\" \n- \"Machines\" \nThe tabs should show in the order in which they are listed above. \n\n\"Layer details\" tab: \nIn not-editable pages, the tab shows: \n- A button to add / remove the layer to / from the project. In this tab, the button labels are: \n\t- \"Add the $layer_name layer to your project\" \n\t- \"Delete the $layer_name layer from your project\" \n\n- Some details about the layer: repository URL, repository subdirectory, revision (branch / tag / commit) and the list of layer dependencies. This is the information required from users when importing a layer. The subdirectory and the layer dependencies can be blank.", + "expected_results": "" + }, + "7": { + "action": "If blank, they show as \"not set\". \n\nEditing the \"Repository URL\" \nThe \"Git repository URL\" cannot be blank. Therefore, we show only a \"change\" icon next to it. When you click the icon, the text input field is set to the current value. If you delete the value from the input field, we disable the \"save\" button. We enable it again when you type something in the field. \n\nEditing the \"Repository subdirectory\" \nThe \"Repository subdirectory\" can be blank. Therefore, we show both \"change\" and \"delete\" icons. When you click the \"delete\" icon, we \nshow the label \"Not set\".", + "expected_results": "" + }, + "8": { + "action": "\nWhen you click the \"change\" icon, the text input field is set \nto the current value. \nIf you delete the value from the input field, we disable the \"save\" button. We enable it again when you type something in the field. \n \n\nEditing the \"Revision\" \nThe \"Revision\" cannot be blank. Therefore, we show only a \"change\" icon next to it. When you click the icon, the text input field is set to the current value. If you delete the value from the input field, we disable the \"save\" button. We enable it again when you type something in the field. \n\nThe \"Recipes\" tab \nIt shows: \n1: A counter in the tab label showing the total number of targets provided by the layer \n2: A button to add/remove the layer to/from the project. ", + "expected_results": "" + }, + "9": { + "action": "In this tab, the button labels are \n \n\"Add the $layer_name layer to your project to enable \nthese targets\" \n\"Delete the $layer_name layer from your project\" \n\n3: A \"Recipes\" table with the following columns: \n \n- Recipe \n- Description: the value of the DESCRIPTION variable. If not set, then the value of the SUMMARY variable. \n- Build recipe, which shows a \"build recipe\" button. The \"build recipe\" button is disabled when the layer is not added to the project. \nThe recipes table is sorted by \"Recipe\" in ascending alphabetical order. \n\nThe \"Machines\" tab: \nIt shows: \n1: A counter in the tab label showing the total number of machines provided by the layer \n2: A button to add/remove the layer to/from the project.", + "expected_results": "" + }, + "10": { + "action": "In this tab, the button labels are \n \n\t- \"Add the $layer_name layer to your project to enable these machines\" \n\t- \"Delete the $layer_name layer from your project\" \n3: A \"machines\" table with the following columns: \n- Machine. \n \n- Description: The value of the DESCRIPTION variable in the .conf file \n- Select machine, which shows a \"select\" button. The \"select\" button is disabled when the layer is not added to the project. \nThe machines table is sorted by \"Machine\" in ascending alphabetical order. ", + "expected_results": "All mentioned elements should be present and functional." + } + }, + "summary": "Layer_details_page:_UI_functionality_for_imported_layers" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Multiple_build_directories", + "author": [ + { + "email": "stanciux.mihail@intel.com", + "name": "stanciux.mihail@intel.com" + } + ], + "execution": { + "1": { + "action": "after starting Toaster for the first time, go to http://[localhost]:8000/admin/ and login with the admin user you created during setup. Click on the Build environments section, and on the BuildEnvironment object. \n\n\n\nNote: you can create a superuser to enter as admin with ... poky/bitbake/lib/toaster/manage.py createsuperuser \n\n\n", + "expected_results": "" + }, + "2": { + "action": "make note of the \"sourcedir\" and \"builddir\" values. The build dir will be something like \"/home/user/path/build\" \n\n", + "expected_results": "" + }, + "3": { + "action": " click \"back\", and click on the \"Add build environment\" button in the upper right corner. \n\n", + "expected_results": "" + }, + "4": { + "action": "enter Address \"2\", Betype: \"local\", \"sourcedir\" is to be set to whatever the original build env is set, and \"builddir\" is ANOTHER path at the same level as the original builddir - e.g. \"/home/user/path/build2\" \n\n", + "expected_results": "" + }, + "5": { + "action": "Click save \n\n", + "expected_results": "" + }, + "6": { + "action": "Execute command : /poky$ source oe-init-build-env build2 \n\n", + "expected_results": "" + }, + "7": { + "action": "Create new project \n\n", + "expected_results": "" + }, + "8": { + "action": "issue 2 build (e.g. core-image-minimal core-image-sato)\n\n\n\n\n\n", + "expected_results": "Both build commands should run simultaneously." + } + }, + "summary": "Multiple_build_directories" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Run_again_button_from_all_builds_page_must_run_the_specified_task", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": " Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a release and click on create project or select an existing project.", + "expected_results": " Project Created. \n" + }, + "4": { + "action": "Build a image task (ex: core-image-minimal:clean) and wait until build finish.\nfrom all build page.", + "expected_results": " Build task finishes successfully. \n" + }, + "5": { + "action": "Click on rebuild button from all build page.", + "expected_results": "Specified task will run again. \n" + }, + "6": { + "action": "Click on the build and verify if the number of tasks executed = 1.", + "expected_results": "Only the specified task is executed. \n" + }, + "7": { + "action": "From project builds page click on run again button.", + "expected_results": "Specified task will run again.\n" + }, + "8": { + "action": "Click on the build and verify if the number of tasks executed = 1.", + "expected_results": "" + } + }, + "summary": "Run_again_button_from_all_builds_page_must_run_the_specified_task" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Intel_layers_builds", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Click on layers tab.", + "expected_results": "Open compatible layers page. \n" + }, + "5": { + "action": "Search for intel.", + "expected_results": "Return results \n" + }, + "6": { + "action": "Add intel layers like: meta-intel, meta-intel-quark.", + "expected_results": "Layers added to project. \n" + }, + "7": { + "action": "Click on the added layer.", + "expected_results": "Open layer page. \n" + }, + "8": { + "action": "From machine tab, select a machine.", + "expected_results": "Machine has changed. \n" + }, + "9": { + "action": "Build a recipe(core-image-minimal) or a recipe from recipe tab.", + "expected_results": "Build finishes successfully." + } + }, + "summary": "Intel_layers_builds" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Download_other_artifacts", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Delete the build/tmp folder. (to make sure the rootfs task runs and other artifacts are generated for the build)", + "expected_results": "" + }, + "2": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n\t" + }, + "3": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n\t" + }, + "4": { + "action": "Enter a project name, select a release and click on create project.", + "expected_results": "Project Created. \n\t" + }, + "5": { + "action": "Build an image recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": "Build finishes successfully. \n\t" + }, + "6": { + "action": "Click on the built recipe.", + "expected_results": "Open build summary page. \n\t" + }, + "7": { + "action": "From other artifacts tab click on a link.", + "expected_results": "You can download other artifacts." + } + }, + "summary": "Download_other_artifacts" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Download_licence_manifest", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Delete the build/tmp folder. (to make sure license manifest is generated)", + "expected_results": "" + }, + "2": { + "action": "Start Toaster \n\n", + "expected_results": "Toaster starts. \n" + }, + "3": { + "action": "Click on new project button. \n\n", + "expected_results": "Open create a new project page. \n" + }, + "4": { + "action": "Enter a project name, select a release and click on create project. \n\n", + "expected_results": "Project Created. \n" + }, + "5": { + "action": "Build an image recipe (ex: core-image-minimal) and wait until build finish. \n\n", + "expected_results": "Build finishes successfully. \n" + }, + "6": { + "action": "Click on the built recipe. \n\n", + "expected_results": "Open build summary page. \n" + }, + "7": { + "action": "From Image tab click on \"Download\" button for License manifest.", + "expected_results": "You can download license manifest." + } + }, + "summary": "Download_licence_manifest" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_dependencies_layers", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Click on Layers.", + "expected_results": "Open compatible layers page. \n" + }, + "5": { + "action": "Add a layer with multi-level dependencies. (ex: meta-acer) \nThis layer depends on meta-networking, which in turn depends on meta-android. \n \n", + "expected_results": "The selected layer and dependencies were added to project. \n" + }, + "6": { + "action": "Check if meta-python appears in the dependencies list, and add the layers to project.", + "expected_results": "" + }, + "7": { + "action": "Delete a dependency layer.", + "expected_results": "Layer removed from project. \n \n" + }, + "8": { + "action": "Build a recipe (ex: core-image-minimal) and wait until build finish.\n", + "expected_results": "Build will fail with an error.\n\n\t" + } + }, + "summary": "Test_dependencies_layers" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_build_recipe_button_from_recipes_page", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Click on software recipes / image recipes.", + "expected_results": "Open compatible software recipes page. \n" + }, + "5": { + "action": "Select a recipe and click on 'add layer' button.", + "expected_results": "Layer added to project and the 'add layer' button becomes 'build recipe'. \n" + }, + "6": { + "action": "Click on \"Build recipe\" button for one recipe (ex : core-image-minimal / busybox).", + "expected_results": "Build finishes successfully." + }, + "7": { + "action": "Test this for software and image recipes tables.", + "expected_results": "" + } + }, + "summary": "Test_build_recipe_button_from_recipes_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_compatible_machines", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a master release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Go to machines page.", + "expected_results": "Open compatible machines page. \n" + }, + "5": { + "action": "Choose a machine and click on add layer for it. (intel-core2-32)", + "expected_results": "Layers added to project and add layer button becomes select machine. \n" + }, + "6": { + "action": "Click on select machine.", + "expected_results": "Machine has changed. \n" + }, + "7": { + "action": "Go to layer page that generate the machine. (meta-intel)", + "expected_results": "Open layer page \n" + }, + "8": { + "action": "Build a recipe generated by that layer.", + "expected_results": "Build finishes successfully." + } + }, + "summary": "Test_compatible_machines" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Builds_with_different_machines", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select a master release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Select a machine (ex: qemux86-64)", + "expected_results": "The machine has changed. \n" + }, + "5": { + "action": "Build a recipe (ex: core-image-minimal) and wait until buid finish.", + "expected_results": "Build finishes successfully. \n" + }, + "6": { + "action": "Go to project page and change the machine (ex: qemumips)", + "expected_results": "The machine has changed. \n" + }, + "7": { + "action": "Build a recipe (ex: core-image-sato) and wait until build finish.", + "expected_results": "Build finishes successfully. \n\nYou can build recipes with different machines." + }, + "8": { + "action": "Check on build summary page that the machine match the machine selected.", + "expected_results": "" + } + }, + "summary": "Builds_with_different_machines" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_bitbake_variables_-_IMAGE_FSTYPES", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": "Click on new project button.", + "expected_results": "Open create a new project page. \n" + }, + "3": { + "action": "Enter a project name, select release and click on create project.", + "expected_results": "Project Created. \n" + }, + "4": { + "action": "Go to Configuration --> BitBake variables", + "expected_results": "Open Bitbake variables page. \n" + }, + "5": { + "action": "Change IMAGE_FSTYPES variable, add some image types like: hddimg, ext4, etc.", + "expected_results": "Image types were added. \n" + }, + "6": { + "action": "Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": "Build finishes successfully. \n" + }, + "7": { + "action": "Verify in the build summary page if the image types selected were built.", + "expected_results": "All the image types selected appears in the build summary page." + } + }, + "summary": "Test_bitbake_variables_-_IMAGE_FSTYPES" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Software_recipes:_default_view", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": " If no images exist in the project, build an image by inserting \"core-image-minimal\" in the \"Recipes\" field and press the \"Build\" button. Wait for the image to finish building. \n\n", + "expected_results": "" + }, + "3": { + "action": "On the project page click on the \"Software Recipes\" link situated in the left-handed side of the page, under the \"Project configuration\" menus, in the \"COMPATIBLE METADATA\" table. \n\n\n", + "expected_results": "" + }, + "4": { + "action": "Check that \"Compatible software recipes\" table is populated. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that the following columns are shown by default: \n\n\t\tSoftware recipe \n\t\tDescription \n \n\t\tLayer \n\t\tBuild \n\t\t Version ", + "expected_results": "" + } + }, + "summary": "Software_recipes:_default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Software_recipes:_sorting_the_content_of_the_software_recipes_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Navigate to the \"Software Recipes\" page. \n\n", + "expected_results": "" + }, + "3": { + "action": "Make sure the table is sorted on the \"Software Recipe\" column by default in ascending order. \n\n", + "expected_results": "" + }, + "4": { + "action": "Activate all columns from the \"Edit column\" drop-down menu. Check that \"Build\" and \"Software Recipe\" columns cannot be unchecked. \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that \"Software Recipe\", \"Section\", \"License\", \"Layer\" are the only sortable table heads. \n\n", + "expected_results": "" + }, + "6": { + "action": "Sort the table by \"Layer\" and then navigate away by selecting a layer(such as meta-yocto). When you click \"back\" button in web-browser to go back to the \"Compatible image recipes\" table it should still be sorted by \"Layer\". \n\n", + "expected_results": "" + }, + "7": { + "action": "Sorting and \"Edit columns\" \nIf you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Recipe\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu. \n\n", + "expected_results": "" + }, + "8": { + "action": "Sorting and search \nSearching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. \nSort recipes by \"Layer\" column heading. Input a string (such as \"meta\") in search box and click search button. Make sure results returned are sorted by \"Layer\".", + "expected_results": "" + } + }, + "summary": "Software_recipes:_sorting_the_content_of_the_software_recipes_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Software_recipes:_Searching_the_content_of_the_software_recipes_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "Navigate to the \"Software Recipes\" page. \n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the search is made of a text input field and a \"Search\" button in a toolbar above the table. \n\n", + "expected_results": "" + }, + "4": { + "action": "When no search query has been entered, we have placeholder text saying: \"Search compatible software recipes\". \n\n", + "expected_results": "" + }, + "5": { + "action": "Input \"core\" in the text input field. The placeholder text disappears when the first character is typed. Click search button. \n\n", + "expected_results": "" + }, + "6": { + "action": " \n(1) returned results \nThe search string is kept in the text input field. The results returned occur. Click \"Clear search\" icon to clear the search and display the compatible recipes. \n(2) no results returned \nIf your search query returns no results, the page heading changes to \"No recipes found\", and we show you an alert with a search form and an option to show all targets. Check that \"show compatible recipes\" button is available. \n\n", + "expected_results": "" + }, + "7": { + "action": "When I run a search, the search happens against the following columns (independently of they being shown or hidden):\n- Software Recipe\n- Recipe version\n- Description\n- Recipe file\n- Section\n- License\n- Layer\n- Revision\nInput a string to search for the above column headings separately to make sure that the search happens against the columns. \n", + "expected_results": "" + }, + "8": { + "action": "Search, sorting and \"Edit columns\" \nSearching does not change the state of the table: the same columns remain hidden and the same sorting applied when search results are displayed, but filters are cleared by the search results.\nSearch a string and make sure that the same columns remain hidden and the same sorting applied. \n\n", + "expected_results": "" + }, + "9": { + "action": "Search and filters \nThe scope of the filters is the content currently on the table (this means all table pages, not only the one displayed). The scope of the search is always the content of the database. \n\nIf I run a search query, any filter applied afterwards will filter the content returned by the search query. \n\nIf I run a search query while a filter is applied, the filter is cleared by the results of the search query (i.e. we display the results of the search query and clear the filter applied beforehand). The same happens if I click the \"Clear search\" icon when a filter is applied to a set of search results (both search results and applied filter are cleared, and the table shows all the targets). ", + "expected_results": "" + } + }, + "summary": "Software_recipes:_Searching_the_content_of_the_software_recipes_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Software_recipes:_Filter_the_contents_of_the_software_recipes_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All builds\" table.", + "expected_results": "" + }, + "2": { + "action": "Navigate to the \"Software Recipes\" page.", + "expected_results": "" + }, + "3": { + "action": "Make sure the following table column has filters: \n- Build", + "expected_results": "" + }, + "4": { + "action": "Filters are mutually exclusive. Click a filter button of a one column and a filter dialogue occurs. Select a filter item. The filter result would be showed. Then select another filter item of another column and the previously applied filter is overridden by the newly selected filter when a filter from a different column is applied to the table. In this state, we show some help text next to the \"Apply\" button, saying \"You can only apply one filter to the table. This filter will override the current filter.\"", + "expected_results": "" + }, + "5": { + "action": "Filters are overridden by search. Run a search query and you can see previous filter results are overridden by the results of the search query.", + "expected_results": "" + } + }, + "summary": "Software_recipes:_Filter_the_contents_of_the_software_recipes_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_the_packages_included_in_the_image", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": " Click on new project button.", + "expected_results": " Open create a new project page. \n" + }, + "3": { + "action": " Enter a project name, select a release and click on create project.", + "expected_results": " Project Created. \n" + }, + "4": { + "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": " Build finishes successfully. \n" + }, + "5": { + "action": " Click on the built recipe.", + "expected_results": " Open build summary page. \n" + }, + "6": { + "action": " Under IMAGES tab click on the recipe built.", + "expected_results": "Image page open. \n" + }, + "7": { + "action": "Click on a package name.", + "expected_results": "Open the package page. \n" + }, + "8": { + "action": "Under file title click on the link to file.", + "expected_results": "You are redirected to directory structure and you can see where the file is located." + } + }, + "summary": "Test_the_packages_included_in_the_image" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_the_filters_from_a_image_page", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": " Click on new project button.", + "expected_results": " Open create a new project page. \n" + }, + "3": { + "action": " Enter a project name, select a release and click on create project.", + "expected_results": " Project Created. \n" + }, + "4": { + "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": " Build finishes successfully. \n" + }, + "5": { + "action": " Click on the built recipe.", + "expected_results": " Open build summary page. \n" + }, + "6": { + "action": "Click on Configuration - Bitbake Variables.", + "expected_results": "Open bitbake variables page. \n" + }, + "7": { + "action": "Test Description filter. ", + "expected_results": "Filter works ok. (filter returns only items that match the selected criteria) " + } + }, + "summary": "Test_the_filters_from_a_image_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_dependencies_link", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Start Toaster.", + "expected_results": "Toaster starts. \n" + }, + "2": { + "action": " Click on new project button.", + "expected_results": " Open create a new project page. \n" + }, + "3": { + "action": " Enter a project name, select a release and click on create project.", + "expected_results": " Project Created. \n" + }, + "4": { + "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": " Build finishes successfully. \n" + }, + "5": { + "action": " Click on the built recipe.", + "expected_results": " Open build summary page. \n" + }, + "6": { + "action": "Click on recipes tab.", + "expected_results": "Open recipes page. \n" + }, + "7": { + "action": "Click on edit columns and select Dependencies.", + "expected_results": "Dependencies column is shown in the table. \n" + }, + "8": { + "action": "Click on a number of dependencies.", + "expected_results": "A pop up with dependencies will appear. \n" + }, + "9": { + "action": "Click on a dependency. ", + "expected_results": "Open recipe dependency page. " + } + }, + "summary": "Test_dependencies_link" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_recipe_file_link", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster. \n\n\t", + "expected_results": "Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n\t", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release (ex: master) and click on create project. \n\n\t", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": "Click on Image recipes tab. \n\n\t", + "expected_results": "Open Compatible image recipes table. \n\n\t" + }, + "5": { + "action": "Click on edit columns and select recipe file. \n\n\t", + "expected_results": "Recipe file column appears in the table. \n\n\t" + }, + "6": { + "action": "Click on the blue button near a recipe file. \n\n\t", + "expected_results": "" + }, + "7": { + "action": "Repet steps - 4 to 6 for software recipes.", + "expected_results": "" + } + }, + "summary": "Test_recipe_file_link" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.See_packages_size", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster. \n\n\t", + "expected_results": " Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n\t", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release and click on create project. \n\n\t", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": " Build a recipe (ex: core-image-minimal) and wait until build finish. \n\n\t", + "expected_results": " Build finishes successfully. \n\n\t" + }, + "5": { + "action": " Click on the built recipe. \n\n\t", + "expected_results": " Open build summary page. \n\n\t" + }, + "6": { + "action": "Click on packages tab. \n\n\t", + "expected_results": "Open packages page. \n\n\t" + }, + "7": { + "action": "Click on size to sort the table. ", + "expected_results": "You can check the size of each package. \n\nWhen you click on 'Size' the first time, the correct sorting is the inverse one (biggest package on top). Clicking a second time will invert the sorting (you'll see packages with 0 B size on top)." + } + }, + "summary": "See_packages_size" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Build_multiple_recipes", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Start Toaster. \n\n\t", + "expected_results": " Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n\t", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release and click on create project. \n\n\t", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": " Build a multiple recipes (ex: \"core-image-minimal core-image-sato\") and wait until build finish. ", + "expected_results": "Builds finishes successfully. \n\nYou can build multiple recipes with toaster" + } + }, + "summary": "Build_multiple_recipes" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Build_a_recipe_with_different_distro", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Start Toaster. \n\n\t", + "expected_results": " Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n\t", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release and click on create project. \n\n\t", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": "From project page click on Bitbake variables tab. \n\n\t", + "expected_results": "Open Bitbake variables page. \n\n\t" + }, + "5": { + "action": "Click on change button for distro. \n\n\t", + "expected_results": "A type in form appears. \n\n\t" + }, + "6": { + "action": "Change distro (ex: poky-lsb). \n\n\t", + "expected_results": "Distro has changed. \n\n\t" + }, + "7": { + "action": "Add specific layers for distro (meta-qt3, meta-qt4) \n\t\n\t", + "expected_results": "Layers added to the project \n\n\t" + }, + "8": { + "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": "Build finishes successfully. \n\nThe 'success' criteria for this one should be that the build is reported as using the poky-lsb distro in the build summary page, and that the DISTRO variable value in the bitbake variables table is set to the value specified in toaster (poky-lsb again)." + } + }, + "summary": "Build_a_recipe_with_different_distro" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_package_format_-_ipk_rpm_deb", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": " Start Toaster. \n\n\t", + "expected_results": " Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n\t", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release and click on create project. \n\n\t", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": "From the project page click on bitbake variables tab. \n\n\t", + "expected_results": "Open bitbake variables page. \n\n\t" + }, + "5": { + "action": "Click on change button near PACKAGE_CLASSES and select all the package formats (rpm, deb, ipk). \n\n\t", + "expected_results": "Package classes selected. \n\n\t" + }, + "6": { + "action": "Build a recipe (ex: core-image-minimal) and wait until build finish.", + "expected_results": "Build finishes successfully.\nYou can see the package classes in the build summary page." + } + }, + "summary": "Test_package_format_-_ipk_rpm_deb" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Test_IMAGE_INSTALL_append_variable", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster. \n\n", + "expected_results": " Toaster starts. \n\n\t" + }, + "2": { + "action": " Click on new project button. \n\n", + "expected_results": " Open create a new project page. \n\n\t" + }, + "3": { + "action": " Enter a project name, select a release and click on create project. \n\n", + "expected_results": " Project Created. \n\n\t" + }, + "4": { + "action": "From the project page click on bitbake variables tab. \n\n", + "expected_results": "Open bitbake variables page. \n\n\t" + }, + "5": { + "action": "Click on change button for IMAGE_INSTALL_append and add a variable (ex: acpid). \n\n", + "expected_results": "Variable added. \n\n\t" + }, + "6": { + "action": "Build a recipe (ex: core-image-minimal) and wait until build finish. \n\n", + "expected_results": "Build finishes successfully. \n\n\t" + }, + "7": { + "action": "After build finishes go to build page. \n\n", + "expected_results": "Open build summary page. \n\n\t" + }, + "8": { + "action": "Go to package tab and search for acpid.", + "expected_results": "You should get results for ssh packages." + } + }, + "summary": "Test_IMAGE_INSTALL_append_variable" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.New_custom_image:_default_view", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the table is populated with the list of image recipes (eg. core-image minimal, core-image-lsb) \n\n\n", + "expected_results": "" + }, + "4": { + "action": " Check that by default the following columns are shown: Image recipe, Version, Description, Layer, Customise \n\n\n", + "expected_results": "" + }, + "5": { + "action": "From the \"Edit columns\" menu, activate the: Recipe file, Section, License, Git revision \n\n\n", + "expected_results": "" + }, + "6": { + "action": "Check that the \"Git revision\" entries match the release entry from the main project page, in the project details section. \n\n\n", + "expected_results": "" + }, + "7": { + "action": "Check that the image recipes provided by layers added to the project show a 'customise' button, while image recipes provided by layers not added to the project show an 'add layer' button ", + "expected_results": "" + } + }, + "summary": "New_custom_image:_default_view" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.New_custom_image:_sorting_the_content_of_new_custom_image_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n", + "expected_results": "" + }, + "3": { + "action": "Make sure that the table is sorted on the ‘Image recipe’ column by default in ascending order. \n\n", + "expected_results": "" + }, + "4": { + "action": "Clicking on Image recipe should revert the sorting. (from 'a to z' changes to 'z to a') \n\n", + "expected_results": "" + }, + "5": { + "action": "From the \"Edit columns\" menu activate all the columns. Check that ‘Image recipe’ and ‘Customise’ columns cannot be unchecked. \n\n", + "expected_results": "" + }, + "6": { + "action": "Check that Image recipe, Section, Layer and License are the only sortable table heads. \n\n", + "expected_results": "" + }, + "7": { + "action": "Sort the table by \"Layer\" and then navigate away by selecting an image (such as core-image-lsb). When you click the \"back\" button in the web-browser to go back, the \"New custom image\" table should still be sorted by \"Layer\". \nThis should apply also by navigating back to the page by any other means. \n\n", + "expected_results": "" + }, + "8": { + "action": "Sorting and \"Edit columns\" menu: If you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Image recipe\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu \n\n", + "expected_results": "" + }, + "9": { + "action": "Sorting and search: Searching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. Sort recipes by \"Layer\" column heading. Input a string (such as \"core-image\") in search box and click search button. Make sure results returned are sorted by \"Layer\".", + "expected_results": "N/A" + } + }, + "summary": "New_custom_image:_sorting_the_content_of_new_custom_image_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.New_custom_image:_searching_the_content_of_new_custom_image_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n \n\n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Check that the search is made of a text input field and a \"Search\" button in a toolbar above the table. When no search query has been entered, the text input field should show the following placeholder text: \"Search select the image recipe you want to customise\" \n \n\n\n", + "expected_results": "" + }, + "4": { + "action": "Input \"core\" in the text input field. The placeholder text disappears when the first character is typed. Click search button. \n \n\n\n", + "expected_results": "" + }, + "5": { + "action": "The search string is kept in the text input field. The results returned occur. Click \"Clear search\" icon to clear the search and display the image recipes. If your search query returns no results, we show you an alert with a search form and an option to show all image recipes. Check that \"show all\" link is available. \n\n\n", + "expected_results": "" + }, + "6": { + "action": "Search, sorting and \"Edit columns\": Searching does not change the state of the table: the same columns remain hidden and the same sorting applied when search results are displayed, but filters are cleared by the search results. Search a string and make sure that the same columns remain hidden and the same sorting applied. \n\n\n", + "expected_results": "" + }, + "7": { + "action": "Search and filters \n \n\t•\tThe scope of the filters is the content currently on the table (this means all table pages, not only the one displayed). The scope of the search is always the content of the database. \n\n\n", + "expected_results": "" + }, + "8": { + "action": "If I run a search query, any filter applied afterwards will filter the content returned by the search query. \tIf I run a search query while a filter is applied, the filter is cleared by the results of the search query (i.e. we display the results of the search query and clear the filter applied beforehand). The same happens if I click the \"Clear search\" icon when a filter is applied to a set of search results (both search results and applied filter are cleared, and the table shows all the targets). ", + "expected_results": "\n \n" + } + }, + "summary": "New_custom_image:_searching_the_content_of_new_custom_image_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.New_custom_image:_Filter_the_contents_of_the_new_custom_image_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Make sure the following table column has filters: Customise \n\n\n", + "expected_results": "" + }, + "4": { + "action": "Click the filter button in the \"Customise\" column and a filter dialogue comes up. Select a filter option. The filter results should be showed. \n\n\n", + "expected_results": "" + }, + "5": { + "action": "Filters are overridden by search. Run a search query and you can see previous filter results are overridden by the results of the search query.", + "expected_results": "N/A" + } + }, + "summary": "New_custom_image:_Filter_the_contents_of_the_new_custom_image_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Create_new_custom_image", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n \n\n\n", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Search for rpi-basic-image, click on 'add layer' button. Make sure a \"layer added\" notification shows and a \"customise\" button is displayed. Click the \"customise\" button, type a name for you new custom image and click on create custom image. \n\n", + "expected_results": "" + }, + "4": { + "action": "Verify that image was created: when you create the custom image you will be redirected to the custom image details page, and a notification at the top of the page should tell you: ‘Your custom image X has been created. You can now add or remove packages as needed. \n\n", + "expected_results": "" + }, + "5": { + "action": "If you select an image that has not been built beforehand you should not see the 'add / remove' packages table until you build the image. \n\n", + "expected_results": "" + }, + "6": { + "action": "If you select an image that has been built beforehand you should see the 'add / remove' packages table when you create the custom image. ", + "expected_results": "N/A" + } + }, + "summary": "Create_new_custom_image" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Custom_image_page_details", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "After you create a new custom image go to the custom image page, by clicking on the custom image. \n\n", + "expected_results": "" + }, + "2": { + "action": "Breadcrumbs \n \n\t * Observe that the 3 breadcrumbs at the top left are: \n \n\t\ta live link that will take you back to the project page \n\t\tCustom images: a live link that will take you back to the custom images table \n\t\timage name(toaster-custom-images): the name of the current custom image (not a link) \n \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Observe the 2 buttons build Custom image and Download recipe file \n \n\ti.\tTest this 2 buttons \n\tii.\tYou should always be able to build the custom image, but you only should be able to download the recipe file when the package content of the custom image is known. When you cannot download the recipe file, the 'download' button at the top of the page is disabled, and the right hand column does not show information about the recipe file. \n\n", + "expected_results": "" + }, + "4": { + "action": "Observe that there is a right-hand box, with information about the images \n \n\ti.\tThere is a number of packages included in the custom image \n\tii.\tApprox package size \n \n\tiii.\tLayer \n \n\tiv.\tImage based on \n \n\tv.\tRecipe file (only when you can download it_ \n\tvi.\tVersion \n \n\tvii.\tLicense \n\n", + "expected_results": "" + }, + "5": { + "action": "Observe that the page includes a table with packages and you can add or remove packages from the custom image. The packages table only appears when: \n\na) the image recipe you chose as your base image when creating the custom image has been built within the project \n\nb) the custom image itself has been built \n\nIf no packages table shows, you see a notification with a build button instead. ", + "expected_results": "N/A" + } + }, + "summary": "Custom_image_page_details" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Custom_image_page_–_Add_|_Remove_packages_table", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "After you create a new custom image go to the custom image page, by clicking on the custom image. \n\n\n", + "expected_results": "" + }, + "2": { + "action": "Make sure that the table is sorted on the ‘Package’ column by default in ascending order. \n\n\n", + "expected_results": "" + }, + "3": { + "action": "Check that by default the following columns are shown: Package, Package Version, Approx Size \n\n\n", + "expected_results": "" + }, + "4": { + "action": "From the \"Edit columns\" menu, activate the: License, Recipe, Recipe version and Reverse dependencies columns \n\n", + "expected_results": "" + }, + "5": { + "action": "Check that ‘Package’, Approx Size, License, Recipe are the only sortable table heads. \n\n", + "expected_results": "" + }, + "6": { + "action": "Sorting and \"Edit columns\": If you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Package\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu \n\n", + "expected_results": "" + }, + "7": { + "action": "Sorting and search: Searching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. Sort recipes by \"Recipe\" column heading. Input a string (such as \"acl\") in search box and click search button. Make sure results returned are still sorted by \"Recipe\". \n\n", + "expected_results": "" + }, + "8": { + "action": "Click \"Clear search\" icon to clear the search and display the Packages. \n\n", + "expected_results": "" + }, + "9": { + "action": "Make sure the following table column has filters: Add | Remove (Click on 'Edit custom image' in the left pane of the custom image) \n\n1", + "expected_results": "" + }, + "10": { + "action": "Click the filter button: a filter dialogue displays. Select a filter option. The filter results should be showed. \n\n1", + "expected_results": "" + }, + "11": { + "action": "Filters are overridden by search. Run a search query and you can see previous filter results are overridden by the results of the search query. \n\n1", + "expected_results": "" + }, + "12": { + "action": "This page needs a special no results message for the search. You can see in the doc attached to\nhttps://bugzilla.yoctoproject.org/show_bug.cgi?id=9154 \n\nTo test it, enter a random string in the search input field (something like \"bbb\") and click the 'search' button. The special no results message includes the following: \n\na) instructions about searching and building recipes in order to generate new packages \n\nb) a search text input field with the search string you typed, a 'clear' icon and a search button. Click the 'clear' icon: the search field should be cleared and the full list of packages should be shown. \n\nc) a 'show all packages' link. Click the link: the search field should be cleared and the full list of packages should be shown. ", + "expected_results": "N/A" + } + }, + "summary": "Custom_image_page_–_Add_|_Remove_packages_table" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Adding_packages_without_dependencies_from_custom_images", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n ", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n ", + "expected_results": " " + }, + "3": { + "action": "Choose an image recipe example:(core-image-sato) and click on the customise button on the far right (note if that layer is not added the button will say +Add layer, add it and then customise) \n\n\n ", + "expected_results": " A pop out should appear and you should get to give the new image a customized name. Then you will be redirected to a page of Add|Remove Packages. If this image has not been build it will not have packages.\n\n" + }, + "4": { + "action": "Build the new image if it has not been build, else start adding packages without dependencies example: attr-doc \n\n \n ", + "expected_results": "You should get a message in blue that says \"You have added 1 package to $image-custom-name: $package-name\" " + }, + "5": { + "action": "Build the image again.\n", + "expected_results": "Expected Result on step 5: the packages you have added should be installed in the image." + } + }, + "summary": "Adding_packages_without_dependencies_from_custom_images" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Removing_packages_without_and_with_dependencies__from_custom_images", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n ", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n\n ", + "expected_results": " A pop out should appear and you should get to give the new image a customized name. Then you will be redirected to a page of Add|Remove Packages. If this image has not been build it will not have packages. \n\n" + }, + "3": { + "action": "Choose an image recipe example:(core-image-sato) and click on the customise button on the far right (note if that layer is not added the button will say +Add layer, add it and then customise) \n\n\n\n ", + "expected_results": "A pop out should appear and you should get to give the new image a customized name. Then you will be redirected to a page of Add|Remove Packages. If this image has not been build it will not have packages.\n\n" + }, + "4": { + "action": "Build the new image if it has not been build else start removing a packages (click on 'Edit custom image' in the left pane of the custom image) that have dependencies and packages that have no dependencies that are already included by clicking on the red button \"Remove Package\" \n\n\n \n ", + "expected_results": "You should get a message in blue that says \"You have removed 1 package to $image-custom-name: $package-name\" " + }, + "5": { + "action": "Build the image again.", + "expected_results": "the packages you have removed should not be installed in the image." + } + }, + "summary": "Removing_packages_without_and_with_dependencies__from_custom_images" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Adding_packages_with_dependencies", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Access a project page, either by creating a new project or accessing an existing project from the \"All projects\" table. \n\n ", + "expected_results": "" + }, + "2": { + "action": "On the project page click on the \"New custom image\" link situated on the left-hand side, near Configuration, builds, import layer \n\n\n ", + "expected_results": " " + }, + "3": { + "action": "Choose an image recipe example:(core-image-sato) and click on the customise button on the far right (note if that layer is not added the button will say +Add layer, add it and then customise) \n\n\n ", + "expected_results": "A pop out should appear and you should get to give the new image a customized name. Then you will be redirected to a page of Add|Remove Packages. If this image has not been build it will not have packages." + }, + "4": { + "action": "Build the new image if it has not been build else start adding packages that have dependencies ( you will be able to see in the dependencies column a little square with a number, that tells you the dependencies it holds) example: libattr this holds 2 dependencies( bash and glibc) ", + "expected_results": " You should get a pop-out that that say \"$package_name dependencies\" then it should list the dependencies. Once clicked on the add packages button it should add the packages listed in the pop-out." + }, + "5": { + "action": "Build the image again.", + "expected_results": "" + } + }, + "summary": "Adding_packages_with_dependencies" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Create_Project", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project by issuing a name and selecting a release version.", + "expected_results": "Once project is created it should redirect you to a new project configuration page" + }, + "3": { + "action": "Check that the h1 page title is set to the name the user typed in the new project form. ", + "expected_results": "" + } + }, + "summary": "Create_Project" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_project_detail_page_left_bar_menu", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": "Once project is created it should redirect you to a new project configuration page. \n\n" + }, + "3": { + "action": "Check the page contains the tabs \n Configuration ---> selected by default \n Compatible Metadata (separation label) \n Custom images \n Image recipes \n Software recipes \n Machines \n Layers \n Extra Configuration (separation label) \n BitBake variables \n\n", + "expected_results": " All elements are present. \n\n" + }, + "4": { + "action": "Click on each element to see if the h2 title is changing to the respective link clicked. Example if clicked on \"Custom Images\" then the h2 title should change to \"Custom images\"", + "expected_results": "All elements are clickable and h2 title changes to the corresponding title.." + } + }, + "summary": "Verify_project_detail_page_left_bar_menu" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Configuration_information_of_Project_Detail_page", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Clone Poky and start toaster \n\n", + "expected_results": "" + }, + "2": { + "action": "Create a master toaster project \n \n", + "expected_results": "Once project is created it should redirect you to a new project configuration page \n\n" + }, + "3": { + "action": "Check that the configuration button on the left side bar is selected by default \n\n", + "expected_results": " Expected result step 3 & 4: The configuration link next to the build link should be selected see attachment. \n\n\n\n" + }, + "4": { + "action": "The configuration details should include canvas: \n Machine \n Most built recipes \n Layers \n Project Release ", + "expected_results": "Expected result step 4: A machine must always be set. \n\nThe default layers specified in the Toaster configuration must always be listed in the layer section (in our case, for the poky configuration we should have openembedded-core, meta-poky and meta-yocto-bsp)" + } + }, + "summary": "Configuration_information_of_Project_Detail_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_Machine_information_of_project_detail_page", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": "Expected result step 2: Once project is created it should redirect you to a new project Configuration page \n\n" + }, + "3": { + "action": "The configuration details should include a label in bold font that says: \n Machine: this canvas should have the machine label type under it and an editing button on the side ", + "expected_results": "Expected result step 3: Compare to the attached snapshot. The machine must always be set." + } + }, + "summary": "Verify_Machine_information_of_project_detail_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_most_built_recipes_information_of_the_project_detail_page", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster ", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": "Expected result step 2: Once project is created it should redirect you to a new project configuration page " + }, + "3": { + "action": "The configuration details should include a label in bold font that says: \n Most built recipes: In this canvas one of the following information should show: \n\n a) If there has been no built recipes it should have a label that says: \n \"You haven't built any recipes yet, choose a recipe to build\" \n\n b) Else it should have a list of built recipes and a check box in front of it. So that it could be selected and built again ", + "expected_results": "Expected result step a: See ProjectDetailPage2.png attachment.\n\nExpected result step b: See ProjectDetailPage.png attachment." + } + }, + "summary": "Verify_most_built_recipes_information_of_the_project_detail_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_project_release_information_on_project_detail_page", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": "Expected result step 2: Once project is created it should redirect you to a new project configuration page. " + }, + "3": { + "action": "The configuration details should include a label in bold font that says: \n Project release: this canvas should also have a label that show the release project you chose at the beginning.", + "expected_results": "Expected result step 3: See attachment ProjectDetailPage.jnp." + } + }, + "summary": "Verify_project_release_information_on_project_detail_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_layer_information_of_the_project_detail_page", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky", + "expected_results": "" + }, + "2": { + "action": "Start toaster", + "expected_results": "Expected result step 2: Once project is created it should redirect you to a new project configuration page. \n\n" + }, + "3": { + "action": "Create a toaster project \n \n", + "expected_results": "Expected result step 3: See attachment of layerCanvas.png\n" + }, + "4": { + "action": "The configuration details should include a label with bold font that says: \n Layer: this canvas should have 3 layers listed by default (openembedded-core, meta-poky, and meta-yocto-bsp). \n Each layer should have a trashcan icon at the side that can be used to erase the label from the project. \n The layer canvas should have a text box with the text \"type a layer name\" a button \"Add layer\" next to it. \n just underneath a \"view compatible layer | import layer\" link. ", + "expected_results": "" + } + }, + "summary": "Verify_layer_information_of_the_project_detail_page" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_project_detail_links", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster ", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n\n", + "expected_results": "Expected result step 2: Once project is created it should redirect you to a new project configuration page. \n\n" + }, + "3": { + "action": "The configuration details should include \n 4 links, starting in the upper left side the Configuration link, Builds(#) link, Import layer link, and the New custom image link. \n\n ", + "expected_results": "Expected result step 3: All links should be clickable and should have information or tables, or forms. see attachment projectDetailLinks.png" + } + }, + "summary": "Verify_project_detail_links" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_build_texbox_exists_and_works", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": " Once project is created it should redirect you to a new project configuration page. \n\n\n" + }, + "3": { + "action": "The configuration details should include \n After the 4 links (Configuration, Build(#), Import layer & New custom image) at the far right there should be a textbox with the label that says....\"Type the recipe you want to build\" and a button \"Build\" \n\n", + "expected_results": "See attachment buildTXT.png, The build button should be disabled whenever the text input field is empty, so that you cannot start a build with a blank target \n\n" + }, + "4": { + "action": "Type in the textbox an image you would like to build example (core-image-minimal) and click the build button.\n\n", + "expected_results": " Image starts building. Whenever there is information in the image recipes and software recipes tables, the text input field should present suggestions from the list of recipes provided by the layers in the \"layers\" list. The suggestions contain the string typed in the input field, and update as you type. They appear on typing the second character. A maximum of 8 suggestions can be shown. They are sorted as follows: first recipes starting with the string, in alphabetical order; then recipes containing the string, also in alphabetical order \n\n\nWhen you click the build button you are brought to the \"Builds\" tab, and a new build in progress appears at the top of the \"Latest project builds\" section" + } + }, + "summary": "Verify_build_texbox_exists_and_works." + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Veryfing_the_builds_link_show_proper_information", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n \n", + "expected_results": " Once project is created it should redirect you to a new project configuration page. \n\n\n" + }, + "3": { + "action": "The configuration details should include \n A builds tab that when clicking on, it should display one of the following: \n \n\n a) A label that says \"Latest project builds\" then a label with \"All project builds\" \n If you have a finished build or there is an ongoing builds then: \n You should see a progress bar of the ongoing builds in the project. \n You should see a table with the already done builds in the project. \n\n\n b) \"All project builds\" and a search textbox with a button nothing else only if there are no builds done in the project \n ", + "expected_results": "Expected result for step a): See ExistingBuilds.png attachment. \n\n\nExpected result for step b): See ZeroBuilds.png attachment. " + } + }, + "summary": "Veryfing_the_builds_link_show_proper_information" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_that_the_Import_layer_link_shows_the_form", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n\n", + "expected_results": " Once project is created it should redirect you to a new project configuration page. \n\n\n" + }, + "3": { + "action": "The configuration details should include \n An Import layer link that when clicking on, it should display: \n A label that says \"Layer repository information\" \n A label that says \"The layer you are importing must be compatible with Yocto Project master, which is the release you are using in this project.\" \n Form composed of the following elements: \n Layer name : textbox \n Git repository URL : textbox \n Repository subdirectory (optional) : textbox \n Git revision : textbox \n Layer dependencies (optional) : \"openembedded-core\" link and (trash icon), textbox and \"Add layer\" button \n Import and add to project : button", + "expected_results": " See attachment ImportLayerForm.png" + } + }, + "summary": "Verify_that_the_Import_layer_link_shows_the_form" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_that_New_Custom_Image_link_works_and_shows_information", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project \n\n", + "expected_results": " Once project is created it should redirect you to a new project configuration page \n\n\n" + }, + "3": { + "action": "The configuration details should include \n A \"New custom image\" tab that when clicking on, it should display: \n a Title label that says: \"Select the image recipe you want to customise(#number_or_recipes_available)\" \n A search textbox with the label of: \"Search and select the image recipe you want to customise\" \n A \"Search button\" \n A \"Edit columns\" button \n A table that will display the customise images available ", + "expected_results": "See attachment CustomImage.png" + } + }, + "summary": "Verify_that_New_Custom_Image_link_works_and_shows_information" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_most_built_recipe_shows_a_maximum_of_5_recipes", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project", + "expected_results": "" + }, + "3": { + "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. ", + "expected_results": " All recipes are built correctly \n\n" + }, + "4": { + "action": "Wait for the recipes to finish ", + "expected_results": "" + }, + "5": { + "action": "Go to the configuration details.", + "expected_results": " You should see 5 of the 6 recipes that were build. If you order the recipes in alphabetical order you should see that the first 5 made the list. " + } + }, + "summary": "Verify_most_built_recipe_shows_a_maximum_of_5_recipes" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_order_sequence_of_listing_in_Most_build_recipes", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project", + "expected_results": "" + }, + "3": { + "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n", + "expected_results": "All recipes are built correctly \n\n" + }, + "4": { + "action": "Wait for the recipes to finish \n\n", + "expected_results": "" + }, + "5": { + "action": "Go to the configuration details. \n\n", + "expected_results": " If you order the recipes in alphabetical order you should see that the first 5 made the list. Only 5 out of the 6 should make the list. \n\n" + }, + "6": { + "action": "Select the 6th recipe that did not make the list and build it again. ", + "expected_results": " Since the 6th recipe is now built twice it should make the list and the recipe in the 5th place should not appear." + } + }, + "summary": "Verify_order_sequence_of_listing_in_Most_build_recipes" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_Most_build_recipes_multiple_selection", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Start toaster", + "expected_results": "" + }, + "2": { + "action": "Create a toaster project", + "expected_results": "" + }, + "3": { + "action": "Build 4 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n", + "expected_results": " All recipes are built correctly \n\n" + }, + "4": { + "action": "Wait for the recipes to finish. \n\n", + "expected_results": "" + }, + "5": { + "action": "Go to the configuration details. \n\n", + "expected_results": " You should see the 4 recipes in alphabetical order. You should also note that the Build button on the upper right hand corner is disabled since no recipe has been selected. \n\n" + }, + "6": { + "action": "Select 1 of the recipes in the most built recipes section. \n\n", + "expected_results": "The build button is automatically enabled. \n\n" + }, + "7": { + "action": "Select multiple (example 2 or 3) recipes in the most built recipes section. \n\n", + "expected_results": " The build button is enabled. \n\n" + }, + "8": { + "action": "Click on the build button to start building the recipes.", + "expected_results": "One recipe start to build and the others are on queue." + } + }, + "summary": "Verify_Most_build_recipes_multiple_selection" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_layer_addition_functionality", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky", + "expected_results": "" + }, + "2": { + "action": "Start toaster", + "expected_results": " Once project is created it should redirect you to a new project configuration page. \n\n" + }, + "3": { + "action": "Create a toaster project with master release \n \n\n", + "expected_results": " See attachment of layerCanvas.png \n\n\n" + }, + "4": { + "action": "Add layers by typing the name in the \"Type a layer name\" input box and adding by clicking the button. \n\n", + "expected_results": " A list of layers with similar name to the one you are typing should appear, giving you the choice to add it. The default text \"Type a layer name\" should disappear as soon as you start typing. \n\n" + }, + "5": { + "action": "Add layers by clicking on the View compatible layers link just bellow the input text box. \n\n", + "expected_results": "This should redirect you to the compatible layers page where a list of compatible layers should appear and allow you to Add layers to the project. \n\n" + }, + "6": { + "action": "Add a layer by importing a layer clicking in the Import layer", + "expected_results": "This link should redirect you to the import layer form where you will be able to add layers from git repository or a local directory. \n\n\n" + } + }, + "summary": "Verify_layer_addition_functionality" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Verify_delete_layer_functionality", + "author": [ + { + "email": "libertad.gonzalez.de.la.cruz@intel.com", + "name": "libertad.gonzalez.de.la.cruz@intel.com" + } + ], + "execution": { + "1": { + "action": "Clone the poky environment git clone http://git.yoctoproject.org/git/poky\n", + "expected_results": "" + }, + "2": { + "action": "Start toaster", + "expected_results": " Once project is created it should redirect you to a new project configuration page.\n\n" + }, + "3": { + "action": "Create a toaster project master release \n \n", + "expected_results": "See attachment of layerCanvas.png \n\n" + }, + "4": { + "action": "Remove openembedded-core layer from the project by clicking the trash icon next to it. \n\n", + "expected_results": "The layer should disappear from the list and a notification should appear at the top of the page saying: \"You have removed 1 layer from your project: \". The layer_name should be a link to the corresponding layer detail page. The layer counter next to the \"layers\" heading should decrease by one. \n" + }, + "5": { + "action": "Remove all the layers from the project", + "expected_results": " you should see a message that reads: \n\nYou need to add some layers. For that you can: \n\n-View all layers compatible with this project \n\n-Import a layer \n\n-Read about layers in the documentation \n\nOr type a layer name below. \n\n\n The \"Choose from the layers compatible with this project\" link should go to the compatible layers page The \"Import a layer\" link should go to the import layer page The \"Read about layers in the documentation\" link should open in a new window and bring you to http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers" + } + }, + "summary": "Verify_delete_layer_functionality" + } + }, + { + "test": { + "@alias": "toaster-managed-mode.toaster-managed.Download_task_log", + "author": [ + { + "email": "alexandru.costinx.roman@intel.com", + "name": "alexandru.costinx.roman@intel.com" + } + ], + "execution": { + "1": { + "action": "Start Toaster. ", + "expected_results": "Toaster starts." + }, + "2": { + "action": "Click on new project button.\n\n", + "expected_results": "Open create a new project page." + }, + "3": { + "action": " Enter a project name, select a release and click on create project or select an existing project. \n\n", + "expected_results": "Project Created." + }, + "4": { + "action": "Build a recipe (ex: core-image-minimal). \n\n", + "expected_results": "Build finish." + }, + "5": { + "action": "Click on the built recipe. \n\n", + "expected_results": "Open build summary page." + }, + "6": { + "action": "Click on tasks tab. \n\n", + "expected_results": "Open tasks page." + }, + "7": { + "action": "Click on a task executed successfully. \n\n", + "expected_results": "Open task page." + }, + "8": { + "action": "Click on \"Download task log\" button. \n", + "expected_results": "You can download the task log. \n" + }, + "9": { + "action": "Click on a failed task. \n", + "expected_results": "Open task page, not appear download task \n" + } + }, + "summary": "Download_task_log" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/manual/toaster-unmanaged-mode.json b/meta/lib/oeqa/manual/toaster-unmanaged-mode.json new file mode 100644 index 0000000000..29d11a87d5 --- /dev/null +++ b/meta/lib/oeqa/manual/toaster-unmanaged-mode.json @@ -0,0 +1,1170 @@ +[ + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Create_a_Yocto_project_and_start_the_Toaster", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Set up yocto project and toaster test environment. \ncd ${installdir} \ngit clone git://git.yoctoproject.org/poky \n\n", + "expected_results": "NA \n\n" + }, + "2": { + "action": "Start up toaster. \ncd ${installdir} \nsource poky/oe-init-build-env \nsource toaster start \n\n", + "expected_results": " \nlog: \nThe system will start. \nSyncing... \nCreating tables ... \nCreating table south_migrationhistory \nInstalling custom SQL ... \nInstalling indexes ... \nInstalled 0 object(s) from 0 fixture(s) \n > south \n\nNot synced (use migrations): \n - orm \n(use ./manage.py migrate to migrate these) \nRunning migrations for orm: \n - Migrating forwards to 0004_auto__add_field_package_installed_name. \n > orm:0001_initial \n > orm:0002_auto__add_field_build_timespent \n > orm:0003_timespent \n - Migration 'orm:0003_timespent' is marked for no-dry-run. \n > orm:0004_auto__add_field_package_installed_name \n - Loading initial data for orm. \nInstalled 0 object(s) from 0 fixture(s) \nserver address: 127.0.0.1, server port: 8200 \nSuccessful start." + }, + "3": { + "action": "Build the yocto project. \nbitbake core-image-minimal \n\n", + "expected_results": "Build successfully. \n" + }, + "4": { + "action": "Use a default web brower to see project build process. \nxdg-open http://localhost:8000/ \nWait for build completion. \n", + "expected_results": "You can open http://localhost:8000/ in a default browser. The build process is showed. " + } + }, + "summary": "Create_a_Yocto_project_and_start_the_Toaster." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Sort_the_content_of_the_builds_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start up toaster.", + "expected_results": "Succeed to start up toaster. " + }, + "2": { + "action": "Create 2 builds, such as \"bitbake core-image-minimal\" and \"bitbake core-image-sato\". Wait for successful builds and then run: http://localhost:8000/", + "expected_results": "Succeed to build the targets. " + }, + "3": { + "action": "Enter \"All build\" table in web browser.", + "expected_results": "NA " + }, + "4": { + "action": "Click \"Completed on\" component to sort.", + "expected_results": "Build targets are sorted out by the \"Completed on\". " + }, + "5": { + "action": "Click \"Completed on\" component again to invert the sorting .", + "expected_results": "The sorting is inverted. " + }, + "6": { + "action": "Have a sort try in other columns. outcome, machine, started on, completed on, errors, warnings, project.", + "expected_results": "See item 4 and 5." + } + }, + "summary": "Sort_the_content_of_the_builds_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Search_the_content_of_the_builds_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start up toaster.", + "expected_results": "NA " + }, + "2": { + "action": "Create 2 builds, such as \"bitbake core-image-minimal\" and \"bitbake core-image-sato\". Wait for successful builds and then run: xdg-open http://localhost:8000/", + "expected_results": "NA " + }, + "3": { + "action": "Enter \"All build\" table in web browser.", + "expected_results": "NA " + }, + "4": { + "action": "Input a string in search component and click search.", + "expected_results": "Show returned search results. When no search query has been entered, we have placeholder text saying: \"Search builds\". The placeholder text disappears when the first character is typed. " + }, + "5": { + "action": "See returned search results.", + "expected_results": "If your search query returns no results, the section heading changes to \"No builds found\", and we show you an alert with a search form and an option to show all builds. " + }, + "6": { + "action": "Click \"Clear search\" icon (icon-remove-sign). Observe all builds are showed. ", + "expected_results": "Click it to clear the search and display all builds." + } + }, + "summary": "Search_the_content_of_the_builds_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Filter_the_content_of_the_builds_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start up toaster.", + "expected_results": "" + }, + "2": { + "action": "Create 2 builds, such as \"bitbake core-image-minimal\" and \"bitbake core-image-sato\". Wait for successful builds and then run: xdg-open http://localhost:8000/.", + "expected_results": "" + }, + "3": { + "action": "Enter \"All build\" table in web browser.", + "expected_results": "" + }, + "4": { + "action": "Make sure the following table columns have filters. \n- Outcome \n-- Started on \n- Completed on \n- Failed tasks", + "expected_results": "" + }, + "5": { + "action": "Filters are mutually exclusive. Click a filter button of a one column and a filter dialogue occurs. Select a filter item. The filter result would be showed. Then select another filter item of another column and the previously applied filter is overridden by the newly selected filter when a filter from a different column is applied to the table. In this state, we show some help text next to the \"Apply\" button, saying \"You can only apply one filter to the table. This filter will override the current filter.\"", + "expected_results": "" + }, + "6": { + "action": "Filters are overridden by search. Run a search query and you can see previous filter results are overridden by the results of the search query.", + "expected_results": "" + }, + "7": { + "action": "Have a try in filters of the following table columns. \n- Outcome \n- Started on \n- Completed on \n- Failed tasks \n", + "expected_results": "NA" + } + }, + "summary": "Filter_the_content_of_the_builds_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Tasks_in_toaster_UI", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": " === TOASTER: Test Instructions for \"Tasks\", \"Time\", \"CPU Usage\", and \"Disk I/O\" pages === \n \nNOTE TO TESTERS: The three pages \"Time\", \"CPU Usage\", and \"Disk I/O\" are simple variations on the \"Tasks\" page. Those test instructions will demonstrate the respective unique parts. \n \n \n", + "expected_results": "" + }, + "2": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "3": { + "action": "In Toaster, select the build, and select the \"Tasks\" link in the left sidebar \n \n", + "expected_results": "" + }, + "4": { + "action": "Breadcrumbs \n \n * Observe that the 4 breadcrumbs at the top left are: \n \n : a live link that will take you back to the project page \n \t: a live link that will take you back to the project Builds page \n : a live link that will take you back to the image dashboard page \n \"Tasks\" \n \n * Test the breadcrumb live links, return to this page \n \n \n", + "expected_results": "" + }, + "5": { + "action": "General Layout \n \n * Observe the left-hand box with links to the other pages of the build \n \n * Observe the title of the table is \"Tasks\", in bold \n \n * Observe the search/filter bar above the table \n \n * Observe the number of table rows in each page matches the number selected in the \"Show rows\" dropdown menu \n \n * Observe at the bottom of the page the \"Showing XX to XX out of xxx entries\", the page selection links, and the \"Show Rows\" selection. \n \n \n", + "expected_results": "" + }, + "6": { + "action": "Columns \n \nNote: to restore the default columns in your browser, for example in Firefox, select \"Tools > Privacy > remove individual cookies\", find the cookies for the IP address of the Toaster engine (for example \"localhost\"), and remove each sub-cookie with the prefix \"_displaycols_*\" (or the whole cookie if those are the only sub-cookies). \n \n * Observe that the default columns are: \n \n \"Order, Recipe, Task, Executed, Outcome, Cache attempt\" \n \n * Click the \"Edit Columns\" button. ", + "expected_results": "" + }, + "7": { + "action": "Observe that the fields are sorted as follows (with the indicated items greyed) \n \n [ ] CPU usage \n [x] Cache attempt \n [ ] Disk I/O (ms) \n [x] Executed \n [x] Order {greyed} \n [x] Outcome \n [x] Recipe {greyed} \n [ ] Recipe version \n [x] Task {greyed} \n [ ] Time (secs) \n \n * For each of the greyed items, attempt to click them. Observe that they do not change. \n \n * For each of the non-greyed items, attempt to click them. Observe that the respective column dynamically appears when checked and disappears when un-checked. ", + "expected_results": "" + }, + "8": { + "action": "Search \n \n * Observe that the search text box background text is \"Search tasks\". \n \n * Set the search text to \"busybox\" and click \"Search\". Observe that only the busybox tasks are listed (about 16). \n \n * Click the \"X\" next to the search text box. Observe that all of the tasks re-appear. \n \n \n", + "expected_results": "" + }, + "9": { + "action": "Column sorts \n \n * Enable all of the columns. \n \n * Observe that by default the \"Order\" column header is in bold, it has a down-arrow icon, and that the table is sorted by this column in ascending order. \n \n * Observe that the columns are in this order, and are sortable only if indicated: \n \n Order {sortable} \n Recipe {sortable} \n Recipe version \n Task {sortable} \n Executed {sortable} \n Outcome {sortable} \n Cache attempt {sortable} \n Time (secs) {sortable} \n CPU usage {sortable} \n Disk I/O (ms) {sortable} ", + "expected_results": "" + }, + "10": { + "action": " Test that each of the sortable columns do sort, ascending and descending \n \n * Observe that each of the column headers have a question mark icon, and that hovering over it provides help text.", + "expected_results": "" + }, + "11": { + "action": "\"Executed\" Filter \n \n * Observe that the \"Executed\" column has the filter icon. Click on it and observe these values, where \"All Tasks\" is the default \n \n (*) All Tasks \n ( ) Executed Tasks \n ( ) Not Executed Tasks \n \n * Click on \"Executed Tasks\" and observe that only rows with the value \"Executed\" are displayed. \n \n * Click on \"Not Executed Tasks\" and observe that only rows with the value \"Not Executed\" are displayed. \n \n * Click on \"All Tasks\" and observe that all rows are displayed. \n \n \n", + "expected_results": "" + }, + "12": { + "action": "\"Outcome\" Filter \n \n * Observe that the \"Outcome\" column has the filter icon. Click on it and observe these values, where \"All Tasks\" is the default \n \n (*) All Tasks \n ( ) Succeeded Tasks \n ( ) Failed Tasks \n ( ) Cached Tasks \n ( ) Prebuilt Tasks \n ( ) Covered Tasks \n ( ) Empty Tasks \n \n * Click on each of the filter selections, and observe that the resulting row \"Outcome\" values match the selection. \n \n * Click on \"All Tasks\" and observe that all rows are displayed. \n \n \n1", + "expected_results": "" + }, + "13": { + "action": "\"Cache attempt\" Filter \n \n * Observe that the \"Cache attempt\" column has the filter icon. Click on it and observe these values, where \"All Tasks\" is the default \n \n (*) All Tasks \n ( ) Tasks with cache attempts \n ( ) Tasks with 'File not in cache' attempts \n ( ) Tasks with 'Failed' cache attempts \n ( ) Tasks with 'Succeeded' cache attempts \n \n * Click on each of the filter selections, and observe that the resulting row \"Outcome\" values match the selection. \n \n Note the with a clean build, only the \"All Tasks\" and \"Tasks with cache attempts\" will return rows. \n \n * Click on \"All Tasks\" and observe that all rows are displayed. \n \n \n1", + "expected_results": "" + }, + "14": { + "action": "Order, Task, Executed, Outcome, Cache attempt links \n \n * Observe that for a given row, the above values are live links that will both take you to the respective task detail page. Click the back button to return. \n\n * Observe that for a given row the values in \"Recipe\" and \"Recipe version\" are live links that will both take you to the respective recipe details page. Click the back button to return \n \n \n1", + "expected_results": "" + }, + "15": { + "action": "Time Page \n \n * \"In Toaster, select the build, and select the \"Time\" link in the left sidebar \n \n * Observe that the default columns are: \n \n \"Recipe\", \"Task\", \"Executed\", \" Outcome\", \"Time (secs)\" \n \n * Observe that the default sort is \"Time (secs)\", in descending order. \n \n * In the \"Edit Columns\" button, turn on all of the columns. \n \n * Observe that the page now matches the \"Tasks\" page, and passes the same tests. \n \n \n1", + "expected_results": "" + }, + "16": { + "action": "CPU Usage Page \n \n * \"In Toaster, select the build, and select the \"CPU Usage\" link in the left sidebar \n \n * Observe that the default columns are: \n \n \"Recipe\", \"Task\", \"Executed\", \"Outcome\", \"CPU Usage\" \n \n * Observe that the default sort is \"CPU Usage\", in descending order. \n \n * In the \"Edit Columns\" button, turn on all of the columns. \n \n * Observe that the page now matches the \"Tasks\" page, and passes the same tests. \n \n \n1", + "expected_results": "" + }, + "17": { + "action": "Disk I/O Page \n \n * \"In Toaster, select the build, and select the \"Disk I/O\" link in the left sidebar \n \n * Observe that the default columns are: \n \n \"Recipe\", \"Task\", \"Executed\", \"Outcome\", \"Disk I/O (ms)\" \n \n * Observe that the default sort is \"Disk I/O (ms)\", in descending order. \n \n * In the \"Edit Columns\" button, turn on all of the columns. \n \n * Observe that the page now matches the \"Tasks\" page, and passes the same tests. ", + "expected_results": "NA" + } + }, + "summary": "Tasks_in_toaster_UI" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.package_detail_in_toaster_UI", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "TOASTER: Test Instructions for \"Package Detail\" page \n \n", + "expected_results": "" + }, + "2": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "3": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar.", + "expected_results": "" + }, + "4": { + "action": "Select a package from the \"Package\" column.", + "expected_results": "" + }, + "5": { + "action": "Breadcrumbs \n * Observe that the 3 breadcrumbs at the top left are: \n : a live link that will take you back to the image dashboard page \n \"Packages\": a live link that will take you back to the Packages page \n \"bash\": the name of the current package (not a link) \n * Test the breadcrumb live links, return to this page ", + "expected_results": "" + }, + "6": { + "action": "General Layout \n * Click on any package \n * Observe that there is no the left-hand box \n * Observe that there is a right-hand box, with information about the package \n * Observe the title is the package name and version, in bold \n * Observe that, if the package is installed in an image, there is a link to the image(s) the package appears in \n * Observe that, if the package is not installed in the image, there are two tab buttons below the title ", + "expected_results": "" + }, + "7": { + "action": "Observe that the tab buttons are: \n Generated files (2) {highlighted} \n Runtime dependencies (4) \n", + "expected_results": "" + }, + "8": { + "action": "Generated files tab \n * Click the \"Generated files\" tab (which should be selected by default) \n * Observe that the number of files in the table matches the number in parenthesis after the \"Generated files\" tab title. \n * Observe that the columns in the table are \"File\" and \"Size\" \n * Observe that the table is sorted by \"File\" in ascending alphabetical order (A to Z). ", + "expected_results": "" + }, + "9": { + "action": "Runtime dependencies tab \n * Click the \"Runtime dependencies\" tab \n * Observe that the number of dependencies in the table matches the number in parenthesis after the \"Runtime dependencies\" tab title. \n * Observe that the columns in the table are: \n \"Package, Version, Size\" \n * Observe that the table is sorted by Package in ascending alphabetical order (A to Z) \n * Observe that the package name values are live links to the respective package details page. ", + "expected_results": "The information icon was eliminated on the columns that where self explanatory. " + }, + "10": { + "action": "Package information box \n * Observe that there is a right-hand box, with information about the package, including in this example the fields: \n \"Size, License, Recipe, Recipe version, Layer, Layer branch, Layer commit\" \n * Observe that each of the field has a question mark icon, and that hovering will provide help text. \n * Observe that none of the values in the right-hand box are blank \n * Observe that the \"Recipe\" value is a live link to the respective recipe detail page. ", + "expected_results": "" + } + }, + "summary": "package_detail_in_toaster_UI" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.recipes:_Sort_the_content_of_the_recipes_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Recipes\" link in the left sidebar. \n\n", + "expected_results": "" + }, + "3": { + "action": "Make sure that by default the \"Recipes\" table is sorted by \"Recipe\" in ascending alphabetical order (A to Z). \n\n", + "expected_results": "" + }, + "4": { + "action": "Sort my \"Recipes\" table by \"Section\" and then navigate away by selecting a recipe(such as click busybox recipe). When you click \"back\" button in web-browser to go back to the \"Recipes\" table it should still be sorted by \"Section\". \n\n", + "expected_results": "" + }, + "5": { + "action": "Make sure all column headings are sortable, except \"Recipe version\", \"Dependencies\", \"Reverse dependencies\" and \"Layer commit\". \n\n", + "expected_results": "" + }, + "6": { + "action": "Sorting and \"Edit columns\" \nIf you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Recipe\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu. \nSort recipes by \"section\" column heading. Then hide \"Section\" column by \"Edit columns\". Make sure that the \"Recipes\" table is sorted by \"Recipe\" in ascending alphabetical order (A to Z). \nNOTE: Bug 5919 is filed against the issue. \n\n", + "expected_results": "" + }, + "7": { + "action": "Sorting and search \nSearching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. \nSort recipes by \"section\" column heading. Input a string (such as \"lib\") in search box and click search button. Make sure results returned should be sorted by \"section\". \n", + "expected_results": "NA" + } + }, + "summary": "recipes:_Sort_the_content_of_the_recipes_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.recipes:_Search_the_content_of_the_recipes_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "recipes: Search the content of the recipes table \n\n", + "expected_results": "" + }, + "2": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "3": { + "action": "In Toaster, select the build, and select the \"Recipes\" link in the left sidebar. \n\n", + "expected_results": "" + }, + "4": { + "action": "Observe the search is made of a text input field and a \"Search\" button in a toolbar above the table. \n\n", + "expected_results": "" + }, + "5": { + "action": "When no search query has been entered, we have placeholder text saying: \"Search recipes\". \n\n", + "expected_results": "" + }, + "6": { + "action": "Input \"lib\" in the text input field. The placeholder text disappears when the first character is typed. Click search button. \n\n", + "expected_results": "" + }, + "7": { + "action": " \n(1) returned results \nThe search string is kept in the text input field. The results returned occur. Click \"Clear search\" icon to clear the search and display all recipes. \n(2) no results returned \nIf your search query returns no results, the page heading changes to \"No recipes found\", and we show you an alert with a search form and an option to show all recipes. Observe \"show all recipes\" button is available. \n\n", + "expected_results": "" + }, + "8": { + "action": "When I run a search, the search happens against the following columns (independently of they being shown or hidden): \n- Recipe \n- Recipe version \n- Recipe file \n- Section \n- License \n- Layer \n- Layer branch \n- Layer commit \n\nInput a string to search for the above 8 column headings separately to make sure that the search happens against the columns. \n\n \n\n", + "expected_results": "" + }, + "9": { + "action": "Search, sorting and \"Edit columns\" \nSearching does not change the state of the table: the same columns remain hidden and the same sorting applied when search results are displayed, but filters are cleared by the search results.\nSearch a string and make sure that the same columns remain hidden and the same sorting applied. Since filter feature of recipes (4296) is obsolete, we don't have to test filter. \n\n", + "expected_results": "" + }, + "10": { + "action": "Search and filters \nThe scope of the filters is the content currently on the table (this means all table pages, not only the one displayed). The scope of the search is always the content of the database.\nSince filter feature of recipes (4296) is obsolete, we don't have to test filter. \n\nIf I run a search query, any filter applied afterwards will filter the content returned by the search query. \n\nIf I run a search query while a filter is applied, the filter is cleared by the results of the search query (i.e. we display the results of the search query and clear the filter applied beforehand).", + "expected_results": "NA" + }, + "11": { + "action": " The same happens if I click the \"Clear search\" icon when a filter is applied to a set of search results (both search results and applied filter are cleared, and the table shows all the tasks). \nSince filter feature of recipes (4296) is obsolete, we don't have to test filter. \n\n", + "expected_results": "NA" + } + }, + "summary": "recipes:_Search_the_content_of_the_recipes_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.recipes:_Customise_the_columns_of_the_recipes_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Recipes\" link in the left sidebar. \n\n", + "expected_results": "" + }, + "3": { + "action": "* Observe that the default columns are: \n \"Recipe, Recipe version, Recipe file, Section , License, Layer\" \n \n * Click the \"Edit Columns\" button. \n * Observe that the fields are sorted as follows (with the indicated items greyed) \n [ ] Dependencies \n [x] Layer \n [ ] Layer branch \n [ ] Layer commit \n [x] License \n [x] Recipe {greyed} \n [x] Recipe file \n [x] Recipe version {greyed} \n [ ] Reverse dependencies \n [x] Section \n \n * For each of the greyed items, attempt to click them. Observe that they do not change. \n * For each of the non-greyed items, attempt to click them. Observe that the respective column dynamically appears when checked and disappears when un-checked.\n", + "expected_results": "NA" + } + }, + "summary": "recipes:_Customise_the_columns_of_the_recipes_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.recipes:_View_a_table_with_all_the_recipes_included_in_an_image_recipe", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Recipes\" link in the left sidebar. \n\n", + "expected_results": "" + }, + "3": { + "action": "By default, the all recipes table displays the following columns in this order: \n(1) Recipe (2) Recipe version: the target version and revision (3) Dependencies (4)Reverse Dependencies (5) License: the value of the target's LICENSE variable (6) Layer: the name of the layer providing the target \n\n", + "expected_results": "" + }, + "4": { + "action": "In the \"Edit columns\" menu, table columns appear listed alphabetically. \nIn the table itself, the default order of columns is as follows: \n(1) Dependencies (2) Layer (3) Layer branch (4) Layer commit (5) License (6) Recipe (7) Recipe file (8) Reverse dependencies (9) Section (10) Version \n\nThe minimum table is made of the 2 columns that provide the information needed to identify a target: Recipe and Recipe version.", + "expected_results": "NA" + } + }, + "summary": "recipes:_View_a_table_with_all_the_recipes_included_in_an_image_recipe" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.recipes:_View_detailed_information_about_a_recipe。", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Create a default Yocto project (qemux86), and start the Toaster. \n \n $ source poky/oe-init-build-env \n $ source toaster start \n $ bitbake core-image-minimal \n $ http://localhost:8000/ \n \n", + "expected_results": "" + }, + "2": { + "action": "Select the \"core-image-minimal\" build link \n \n", + "expected_results": "" + }, + "3": { + "action": "Select the \"Recipes\" link in the left sidebar \n \nObserve that the recipes are listed in a table, and that each recipe name is a live URL link. \n \n", + "expected_results": "" + }, + "4": { + "action": "Observe that \"Packages\" link. It should have an appended value like \"(4)\". Now click on this link. \n \nObserve: \n a) The number of packages matches the previous number in parenthesis. \n \n b) Each package has a version and a size. The size may be zero. \n \n c) Note that if you hover on a package name, it will reveal a URL of the following form. This link should take you to the corresponding package detail page. \n \n localhost:8000/gui/build//package/ \n \n", + "expected_results": "" + }, + "5": { + "action": "Observe that recipes of \"Build Dependencies\" link has an appended value like \"(0)\". Now click on this link. \n \nObserve: \n a) No dependencies appear, and you get a message of the form: \n \n \"$RECIPE_NAME_VERSION has no build dependencies.\" \n \n", + "expected_results": "" + }, + "6": { + "action": "Observe that \"Reverse build dependencies\" link has an appended value like \"(1)\". Now click on this link. \n \nObserve: \n a) The number of packages matches the previous number in parenthesis. \n \n b) The recipe dependency should be \"packagegroup-core-boot\", \n \n c) There should be a respective version displayed, for example \"1.0-r11\" \n \n d) If you hover on the recipe name, it will reveal a URL of the following form. This link should take you to the corresponding recipe detail page. \n \n localhost:8000/gui/build//recipe/ \n \n", + "expected_results": "" + }, + "7": { + "action": "Click the breadcrumb \"Recipes\" at the top, locate the \"gdbm\" recipe, and select it. \n \n", + "expected_results": "" + }, + "8": { + "action": "Observe that \"Packages\" link. It should have an appended value like \"(0)\". Now click on this link. \n \nObserve: \n a) No packages appear, and you get a message of the form: \n \n \"$PACKAGE_NAME_VERSION does not build any packages.\" \n \n", + "expected_results": "" + }, + "9": { + "action": "Observe that \"Build dependencies\" link. It should have an appended value like \"(2)\". Now click on this link. \n \nObserve: \n a) The number of build dependencies matches the previous number in parenthesis. \n \n b) The recipe dependency should have values like \"gettext-native\" and \"libtool-cross\". \n \n c) There should be a respective versions displayed for each dependency. \n \n d) If you hover on a recipe name, it will reveal a URL of the following form. This link should take you to the corresponding recipe detail page. \n \n localhost:8000/gui/build//recipe/ \n \n1", + "expected_results": "" + }, + "10": { + "action": "Observe that \"Reverse build dependencies\" link. It should have an appended value like \"(0)\". Now click on this link. \n \nObserve: \n a) No reverse dependencies appear, and you get a message of the form: \n \n \"$RECIPE_NAME_VERSION does not build any packages.", + "expected_results": "NA" + } + }, + "summary": "recipes:_View_detailed_information_about_a_recipe。" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.variables:_Search_the_content_of_the_bitbake_variables_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Configuration\" link in the left sidebar. Then click \"BitBake variables\" tab. \n\n", + "expected_results": "" + }, + "3": { + "action": "When no search query has been entered, we have placeholder text saying: \"Search BitBake variables\". \n\n", + "expected_results": "" + }, + "4": { + "action": "Input \"lib\" in text input field. The placeholder text disappears when the first character is typed. Click search button. \n\n", + "expected_results": "" + }, + "5": { + "action": "Observe \"4 variables found\" is showed. (It may be other number.) \n If your search query returns no results, we display an alert with: \n - A h3 heading saying: \"No variables found\" \n - A search box \n - The search query is showed in the text input shield. \n - A link to show all variables. we show the variables table. \n\n", + "expected_results": "" + }, + "6": { + "action": "We provide a \"Clear search\" icon (icon-remove-sign). Click it to clear the search and display all variables. Check that the \"Clear search\" icon cannot be accessed using the tab key. \n\n", + "expected_results": "" + }, + "7": { + "action": "Verify search scope. \nWhen I run a search, the search happens against the following columns (independently of they being shown or hidden): \n- Variable \n- Value \n- Set in file \n- Description \n\n", + "expected_results": "" + }, + "8": { + "action": "Verify \"search, sorting and 'Edit columns'\" \nSearching does not change the state of the table: the same columns remain hidden and the same sorting applied \nwhen search results are displayed, but filters are cleared by the search results. \n\n", + "expected_results": "" + }, + "9": { + "action": "Search and filters \nIf I run a search query, any filter applied afterwards will filter the content returned by the search query. \nIf I run a search query while a filter is applied, the filter is cleared by the results of the search query. \n", + "expected_results": "NA" + } + }, + "summary": "variables:_Search_the_content_of_the_bitbake_variables_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.variables:_Sort_the_content_of_the_bitbake_variables_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Configuration\" link in the left sidebar. Then click \"BitBake variables\" tab. \n\n", + "expected_results": "" + }, + "3": { + "action": "By default, the \"variables\" table is sorted by \"Variable\" in ascending alphabetical order (A to Z). \n\n", + "expected_results": "" + }, + "4": { + "action": "Make sure that \"Variable\" column is sortable (Developers have disabled sort function of all other columns to avoid bug 6004) \n\n", + "expected_results": "" + }, + "5": { + "action": "Sorting and search \nSearching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted.", + "expected_results": "NA" + } + }, + "summary": "variables:_Sort_the_content_of_the_bitbake_variables_table." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.builds:_View_a_table_of_all_the_builds_run_for_a_certain_build_directory", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start up toaster and open localhost:8000. ", + "expected_results": "" + }, + "2": { + "action": "You can see 'Latest builds' section lists. - Builds in progress, sorted by inverse start time (last one starting at the top). - 3 latest completed builds, as long as they are less than 24 hours old. If there are no builds in progress or builds completed within the last 24 hours we don't display it: the page shows only the 'All builds' section. ", + "expected_results": "" + }, + "3": { + "action": "You can see the following column headings. You can see the their description in https://bugzilla.yoctoproject.org/attachment.cgi?id=1617. outcome, recipe, machine, started on, completed on, failed tasks, errors, warnings, time, image files, project", + "expected_results": "NA" + } + }, + "summary": "builds:_View_a_table_of_all_the_builds_run_for_a_certain_build_directory" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.builds:_Customise_the_columns_of_the_builds_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start up toaster.", + "expected_results": "" + }, + "2": { + "action": "Create 2 builds, such as \"bitbake core-image-minimal\" and \"bitbake core-image-sato\". Wait for successful builds and then run: xdg-open http://localhost:8000/", + "expected_results": "" + }, + "3": { + "action": "Enter \"All build\" table in web browser.", + "expected_results": "" + }, + "4": { + "action": "Select a few item in \"Edit columns\" to show or hide them in all builds.", + "expected_results": "Unchecked items changed to checked should immediately appear in the table. Checked items changed to unchecked should immediately disappear from the table. If you uncheck the column with the applied sorting, when you close the \"Edit columns\" menu the applied sorting should revert to the table default sorting. Bug 5919 is filed for the function." + } + }, + "summary": "builds:_Customise_the_columns_of_the_builds_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.packages:_View_a_table_with_all_the_packages_built_for_an_image_recipe", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "By default, the built packages table displays the following columns in this order: Package, Package version, Size ", + "expected_results": "" + }, + "4": { + "action": "Apart from the columns shown by default, the following additional columns are also available to users via the \"Edit columns\" menu: Layer, Layer branch, Layer commit, License, Recipe version ", + "expected_results": "" + }, + "5": { + "action": "Enable these columns and observe that table columns appear listed alphabetically in the \"Edit columns\" menu (1)Package (2)Package version (3)Size (4)License (5)Recipe (6)Recipe version (7)Layer (8)Layer branch (9)Layer commit ", + "expected_results": "" + }, + "6": { + "action": "The minimum table is made of the 2 columns that provide the information needed to identify a package: Package and Package version. Their corresponding checkboxes in the \"Edit columns\" menu appear always selected and are in an inactive state. ", + "expected_results": "NA" + } + }, + "summary": "packages:_View_a_table_with_all_the_packages_built_for_an_image_recipe" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.packages:_Sort_the_content_of_the_packages_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "Observe that by default the \"built packages\" table is sorted by \"Package\" in ascending alphabetical order (A to Z). ", + "expected_results": "" + }, + "4": { + "action": "Click \"Size\" column heading to sort my \"built packages\" table by \"Size\". Then navigate away by selecting a package and you can see the package page. After click \"go back\" button in browser to return to the \"built packages\" table it should still be sorted by \"Size\". ", + "expected_results": "" + }, + "5": { + "action": "Observe that all except \"Package version\", \"Recipe version\", \"Layer commit\" are sortable. ", + "expected_results": "" + }, + "6": { + "action": "If you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Package\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu. Bug 5919 is filed for the issue. ", + "expected_results": "" + }, + "7": { + "action": "Searching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. Sort packages by size and search a string. Observe that results returned should be sorted by size. ", + "expected_results": "" + }, + "8": { + "action": "In Toaster, select the build, and select the \"core-image*\" link in the left sidebar. Observe that by default the \"built packages\" table is sorted by \"Package\" in ascending alphabetical order (A to Z). ", + "expected_results": "" + }, + "9": { + "action": "If choose to sort my \"included packages\" table by \"Size\" and then navigate away by selecting a package, when I go back to the \"included packages\" table it should still be sorted by \"Size\". ", + "expected_results": "" + }, + "10": { + "action": "Enable all columns by \"Edit columns\". All except \"Package version\", \"Recipe version\", \"Dependencies\", \"Reverse dependencies\", \"Layer commit\", should be sortable. ", + "expected_results": "" + }, + "11": { + "action": "If you use the \"Edit columns\" menu to hide the column with the applied sorting, we revert the sorting to the default sorting (i.e. \"Package\"). The default sorting always uses one of the core columns, which cannot be hidden using the \"Edit columns\" menu. Bug 5919 is filed for the issue. ", + "expected_results": "" + }, + "12": { + "action": "Searching should have no impact on the applied sorting. Any results returned should be sorted by the sorting criteria selected when the search query was submitted. Sort packages by size and search a string. Observe that results returned should be sorted by size.", + "expected_results": "NA" + } + }, + "summary": "packages:_Sort_the_content_of_the_packages_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.packages:_Customise_the_columns_of_the_packages_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "Observe that by default the \"built packages\" table is sorted by \"Package\" in ascending alphabetical order (A to Z). ", + "expected_results": "" + }, + "4": { + "action": "Select 1 column in \"Edit column\" to show the column. ", + "expected_results": "" + }, + "5": { + "action": "Deselect 1 column in \"Edit column\" to hide 1 column by \"Edit columns\".", + "expected_results": "NA" + } + }, + "summary": "packages:_Customise_the_columns_of_the_packages_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.packages:_Search_the_content_of_the_packages_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "Observe that by default the \"built packages\" table is sorted by \"Package\" in ascending alphabetical order (A to Z). ", + "expected_results": "" + }, + "4": { + "action": "When no search query has been entered, we have placeholder text saying: \"Search packages built\". The placeholder text disappears when the first character is typed. ", + "expected_results": "" + }, + "5": { + "action": "When a search query has been submitted and results returned: ▪ We keep the search string in the text input field. ▪ We provide a \"Clear search\" icon (icon-remove-sign). Click it to clear the search and display all packages. ▪ We change the page heading to indicate the number of results returned by the search query. ", + "expected_results": "" + }, + "6": { + "action": "If your search query returns no results, the page heading changes to \"No packages found\", and we show you an alert with a search form and an option to show all packages. ", + "expected_results": "" + }, + "7": { + "action": "Searching does not change the state of the table: the same columns remain hidden and the same sorting applied. ", + "expected_results": "" + }, + "8": { + "action": "When I run a search, the search happens against the following columns (independently of they being shown or hidden): - Package - Package version - License - Recipe - Recipe version - Layer - Layer branch - Layer commit ", + "expected_results": "" + }, + "9": { + "action": "Hide all columns except \"Package\" and \"Package version\". Search a string which is included in other hidden columns, not the 2 columns. See if returned results occur. ", + "expected_results": "" + }, + "10": { + "action": "In Toaster, select the build, and select the \"core-image*\" link in the left sidebar. Observe that by default the \"included packages\" table is sorted by \"Package\" in ascending alphabetical order (A to Z). Rerun tests according to step 4~9.", + "expected_results": "NA" + } + }, + "summary": "packages:_Search_the_content_of_the_packages_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.View_detailed_information_about_a_layer", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n\n", + "expected_results": "" + }, + "2": { + "action": "Make sure that layer information is shown in: \n* recipes table \n All builds-> core-image-minimal-> recipes \n Select \"Layer\", \"Layer branch\", \"Layer commit\" in Edit columns and observe the 3 columns are showed. Note that the \"Layer branch\" column can be empty. \n\n* recipe details \n All builds-> core-image-minimal-> recipes \n Click a recipe and you can see \"Layer\", \"Layer branch\", \"Layer commit\", \"Recipe details\" information. Note that \"Layer branch\" is not required. If there is no layer branch, you should not see the \"Layer branch\" item on the list.", + "expected_results": "NA" + }, + "3": { + "action": "built packages table \n All builds-> core-image-minimal-> packages \n Select \"Layer\", \"Layer branch\", \"Layer commit\" in Edit columns and observer the 3 columns is showed. Note that the \"Layer branch\" column can be empty. \n\n* built package details \n All builds-> core-image-minimal-> packages \n Click a package and you can see \"Layer\", \"Layer branch\", \"Layer commit\" in package information. Note that \"Layer branch\" is not required. If there is no layer branch, you should not see the \"Layer branch\" item on the list. \n\n* image information \n All builds-> core-image-minimal-> core-image-minimal(images) \n Select \"Layer\", \"Layer branch\", \"Layer commit\" in Edit columns and observer the 3 columns is showed.", + "expected_results": "NA" + }, + "4": { + "action": "Note that the \"Layer branch\" column can be empty. \n\n* installed package details \n All builds-> core-image-minimal-> core-image-minimal(images) \n Click a package and you can see layer information in package information. Note that \"Layer branch\" is not required. If there is no layer branch, you should not see the \"Layer branch\" item on the list. \n\n* configuration \n All builds-> core-image-minimal-> Configuration \n You can see \"Layer\", \"Layer branch\", \"Layer commit\" in configuration summary. Note that the \"Layer branch\" column can be empty. \n\n* build dashboard \n All builds-> core-image-minimal \n You can see \"Layers\" in build summary. ", + "expected_results": "NA" + } + }, + "summary": "View_detailed_information_about_a_layer" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Select_the_number_of_table_rows_displayed_per_page", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Packages\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "Users can select the number of rows they want to see in a table using the \"Show rows\" dropdown menu, which displays above and below each table. The options of the \"Show rows\" dropdown are: 10, 25, 50, 100, 150. ", + "expected_results": "" + }, + "4": { + "action": "The last selected option from the \"Show rows\" menu should be remembered: * Select one option, for example 10 * Click on a package name to navigate away from the built packages table * Click on the \"Packages\" link in the breadcrumb at the top of the page to go back to the packages table Note that 25 is still selected in the \"Show rows\" menu. ", + "expected_results": "" + }, + "5": { + "action": "Observe that the pagination widget is made of: - A \"Previous\" button - A \"Next\" button - A maximum of 5 page buttons. ", + "expected_results": "" + }, + "6": { + "action": "See the pagination function of \"Tasks\", \"Recipes\" links according to steps 3~4.", + "expected_results": "Expected result for step 4: This widget has no previous or next button if testing in toaster 2.2. see Bug 9831" + } + }, + "summary": "Select_the_number_of_table_rows_displayed_per_page" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.View_detailed_configuration_information_for_a_build", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Configuration\" link in the left sidebar. ", + "expected_results": "" + }, + "3": { + "action": "Observe that the configuration page has 2 tabs: - Summary - BitBake variables The Summary tab is the default tab. ", + "expected_results": "" + }, + "4": { + "action": "The following content is included in summary tab. (1) Build configuration (2) Layers (Layer, Layer branch - if any, Layer commit) ", + "expected_results": "" + }, + "5": { + "action": "Observe that \"BitBake variables\" tab includes \"Variable\", \"Value\", \" Set in file\", \"Description\" columns. ", + "expected_results": "" + }, + "6": { + "action": "Click filter button of \"Set in file\" column. Select \"Local configuration variables\" and click \"Apply\" button to see if filter function works well. ", + "expected_results": "" + }, + "7": { + "action": "In the \"Edit columns\" menu, table columns appear listed alphabetically: Description, Set in file, Value, Variable ", + "expected_results": "" + }, + "8": { + "action": "The minimum table is made of the \"Variable\" and \"Value\" columns. ", + "expected_results": "" + }, + "9": { + "action": "Click a variable and a \"History of ${variable}\" dialog will occur. The modal dialog shows the variable value followed by the history table, which has the following columns: - Order: indicates the sequence in which the files set the variable - Configuration file: the location in disk of the file that set the variable - Operation: the value of the operation field as stored in the database. - Line number: the line number where the operation is performed in the configuration file. For such variables, whose value is an empty string, the Value cell in the variables table isempty, which is probably the right thing. In the modal, instead of the variable value, we show an alert (with the class .alert-info) saying: \"The value of is an empty string\" ", + "expected_results": "" + }, + "10": { + "action": "Click arrow links in description tab to see linking variables to the Yocto Project reference manual.", + "expected_results": "NA" + } + }, + "summary": "View_detailed_configuration_information_for_a_build" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.variables:_Customise_the_columns_of_the_bitbake_variables_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". ", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Configuration\" link in the left sidebar. Then click \"BitBake variables\" tab. ", + "expected_results": "" + }, + "3": { + "action": "Show or hide columns by select or deselect options of \"Edit columns\".", + "expected_results": "NA" + } + }, + "summary": "variables:_Customise_the_columns_of_the_bitbake_variables_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.variables:_Filter_the_content_of_the_bitbake_variables_table", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"Configuration\" link in the left sidebar. Then click \"BitBake variables\" tab. \n\n", + "expected_results": "" + }, + "3": { + "action": "Observe \"Set in file\" and \"Description\" columns have filters. \n\n", + "expected_results": "" + }, + "4": { + "action": "Filters are mutually exclusive. Only one column filter can be applied to a table at any given time. \n\n", + "expected_results": "" + }, + "5": { + "action": "Filters are overridden by search. \nThe scope of the filters is the content currently on the table. \nThe scope of the search is always the full content of the database. \nSo: \n- if I run a search query, any filter applied afterwards will filter the content returned by the search query. \nSearch a string and apply a filter. Observe it would filter the content returned by the search query. \n\n- if I run a search query while a filter is applied, the filter is overridden by the results of the search query. \nApply a filter and search a string. Observe that the previous filtered result is overridden by the search. ", + "expected_results": "NA" + } + }, + "summary": "variables:_Filter_the_content_of_the_bitbake_variables_table" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.View_and_navigate_the_full_directory_structure_of_built_images", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build, and select the \"core-image-minimal\" link in the left sidebar. \n\n", + "expected_results": "" + }, + "3": { + "action": "Observe image information page has 2 tabs: \n- Packages included: this tab shows a table with all the packages installed in the image. The tab label includes the total number of packages listed in the table and their size. \n- Directory structure: this tab shows all the files included in the image. \n\n", + "expected_results": "" + }, + "4": { + "action": "By default, the included packages table displays the following columns in this order: \nPackage, Package version, Size, Dependencies \n\n", + "expected_results": "" + }, + "5": { + "action": "Apart from the columns shown by default, the following additional columns are also available to users via the \"Edit columns\" menu: \nLayer, Layer branch, Layer commit, License, Recipe, Recipe version. \n\n", + "expected_results": "" + }, + "6": { + "action": "The minimum table is made of the 2 columns that provide the information needed to identify a package: Package and Package version. \n\n", + "expected_results": "" + }, + "7": { + "action": "By default, the directory structure table shows the top level directories and files in the file system.\nThe table includes the following columns: \nDirectory/File, Symbolic link to, Source package, Size, Permissions, Owner, Group \nOpen some directories and see files. ", + "expected_results": "NA" + } + }, + "summary": "View_and_navigate_the_full_directory_structure_of_built_images" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.View_a_summary_of_all_the_information_available_for_a_build", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and build \"bitbake core-image-minimal\". \n \n", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select the build. \n\n", + "expected_results": "" + }, + "3": { + "action": "A 'Build dashboard' page is showed. \nThe 'Build dashboard' page has two main states: \n(1) Success state: when the build completes successfully. In the success state, if the build target(s) include an image recipe, the page displays an image content module, and the left navigation has an \"Images\" section at the top. \n(2) Fail state: when the build fails (shown in this page). In the fail state, the page always displays an errors content module, and the left navigation does not have an \"Images\" section at the top. \n\n", + "expected_results": "" + }, + "4": { + "action": "Observe that the page provides access to all information available for the selected build. \n(1) Images \n(2) Build: this group provides links to the following pages: \nConfiguration, Tasks, Recipes, Packages \n(3) Performance: this group provides links to the following pages: \nTime, CPU usage, Disk I/O \n\n", + "expected_results": "" + }, + "5": { + "action": "The page heading is made of the build target(s) and the machine, such as \"core-image-minimal qemux86\". If the build has more than one target, they show in ascending alphabetical order (A to Z) both in the page heading and in the \"Images\" section of the left navigation. If the build was successful, there is an image content module for each target that is an image recipe. The modules also show in ascending alphabetical order by target name. \n\n", + "expected_results": "" + }, + "6": { + "action": "Packages included, total package size, license manifest, image files are included in the images section. \n\n", + "expected_results": "" + }, + "7": { + "action": "The information of Machine, Distro, Layers is included in configuration content module of \"Build summary\" section. \nThe information of \"Total number of task\", \"Tasks executed\", \" Tasks not executed\", \"Reuse\" is included in the tasks content module. \nThe information of \"Recipes built\" and \"Packages built\" is included in the \"Recipes&Packages\" content module. ", + "expected_results": "NA" + } + }, + "summary": "View_a_summary_of_all_the_information_available_for_a_build" + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Display_the_content_of_error_messages_and_warnings", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and create a successful build and a failed build. You can force a build to terminate by ctrl+c. ", + "expected_results": "" + }, + "2": { + "action": "Observe that the number of errors and warnings thrown by a build shows in both 'All builds' page and the 'Latest builds' section. ", + "expected_results": "" + }, + "3": { + "action": "Observe that the number and content of errors and warnings thrown by a build shows in the 'Build dashboard' page. ", + "expected_results": "" + }, + "4": { + "action": "Click warning or error links to see warning and error details. ", + "expected_results": "NA" + } + }, + "summary": "Display_the_content_of_error_messages_and_warnings." + } + }, + { + "test": { + "@alias": "toaster-unmanaged-mode.toaster-unmanaged.Build_summary_information_fully_implemented", + "author": [ + { + "email": "Yuan.Sun2@windriver.com", + "name": "Yuan.Sun2@windriver.com" + } + ], + "execution": { + "1": { + "action": "Start with a default Yocto project (qemux86), start the Toaster, and create 4 builds. \na) a successful build with images (bitbake core-image-minimal) \nb) a successful build without images (bitbake mtools-native) \nc) a failed build with errors and warnings (run \"bitbake core-image-sato\", then press control+c to terminate the build)", + "expected_results": "" + }, + "2": { + "action": "In Toaster, select a core-image-minimal build.", + "expected_results": "" + }, + "3": { + "action": "Observe that there is a 'Build dashboard' page captured by Toaster. The page does not exist for builds in progress, only for finished builds. \nThe 'Build dashboard' page is made of: \na) Breadcrumb \nb) Navigation \n IMAGES: core-image-minimal \n BUILD: \n Configuration \n Tasks \n Recipes \n Packages \n PERFORMANCE: \n Time \n CPU usage \n Disk I/O \nc) Page heading (core-image-minimal qemux86) \nd) Section heading (Images, Build summary) \ne) Build status notification (Completed on xx/xx/xx... Build time:xx:xx:xx)", + "expected_results": "" + }, + "4": { + "action": "Observe \"images\" section is made of the following \n.\na) Heading: core-image-minimal, which links to the \"Packages included\" tab of the image information page \nb) Number of packages installed: (packages included xx), which is a link to the \"Packages included\" tab of the image information page \nc) Total installed package size: xxMB \nd) License manifest (which is a link to the \"Packages included\" tab of the information page with the following columns showing: \"Package\", \"Package version\", \"License\" and \"Recipe\". We have bug 6079 open for this). Next to the license manifest is the path to the directory where you can find the license manifest file. \n \ne) Image files (rootfs file names and rootfs file sizes)", + "expected_results": "" + }, + "5": { + "action": "Observe \"Build summary\" section is made of the following. \na) Configuration (which is a link to the configuration page): \n Machine \n Distro \n Layers (sorted in alphabetical order) \nb) Tasks (which is a link to the tasks page) \n Total number of tasks (which is a link to the tasks page) \n Tasks executed (which is a link to the tasks page with the tasks executed filter applied) \n Tasks not executed (which is a link to the tasks pages with the tasks not executed filter applied)\n Reuse \nc) Note that \"Total number of tasks\" should equal number of \"Tasks executed\" + number of \"Tasks not executed\" \nd) Recipes (which is a link to the recipes page) & Packages (which is a link to the packages built page) ", + "expected_results": "" + }, + "6": { + "action": " Number of recipes built (which is a link to the recipes page) \n \n Number of packages built (which is a link to the packages built page)", + "expected_results": "" + }, + "7": { + "action": "Return to localhost:8000 and select a successful build without images (mtools-native) \n.\nObserve the build dashboard for a successful build of a target that is not an image recipe. There is no image content module, and no \"Images\" section in the left navigation.", + "expected_results": "" + }, + "8": { + "action": "Return to localhost:8000 and select the failed build (core-image-sato). Observe the build dashboard for the failed build. \n \na) the errors content module: \nThis module exists for those builds that throw error(s). It appears immediately below the build status notification. \nThe module has 2 states: \n▪ Expanded (shows number of errors and error content) \n▪ Collapsed (shows only the number of errors) \nBy default, the errors module is in the expanded state. \nErrors content modules include the following information: \n(1.1) A heading, which indicates the number of errors thrown by the build, and toggles the module between its 2 states on click. ", + "expected_results": "NA" + }, + "9": { + "action": "Transitions between states should use a slide up / slide down animation. \n(1.2) Error(s) content \n\nb) the warning content module: \nThis module exists for those builds that throw warning(s). \nIt is the last content module shown on the build dashboard. \nThe module has 2 states: \n▪ Expanded (shows number of warnings and warning content) \n▪ Collapsed (shows only the number of warnings) \nBy default, the warning module is in the collapsed state. Warnings content modules include the following information: \n(2.1) A heading, which indicates the number of warnings thrown by the build, and toggles the module between its 2 \nstates on click. Transitions between states should use a slide up / slide down animation. \n(2.2) Warning(s) content ", + "expected_results": "NA" + } + }, + "summary": "Build_summary_information_fully_implemented" + } + } +]
\ No newline at end of file diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index ef81a8cb7d..c1ed39d776 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py @@ -161,7 +161,7 @@ class DnfRepoTest(DnfTest): #check curl-dev is not installed adter removing all curl occurrences status, output = self.target.run('dnf list --installed | grep %s'% excludepkg, 1500) self.assertEqual(1, status, "%s was not removed, is listed as installed"%excludepkg) - self.dnf_with_repo('install -y --exclude=%s curl*' % excludepkg) + self.dnf_with_repo('install -y --exclude=%s --exclude=curl-staticdev curl*' % excludepkg) #check curl-dev is not installed after being excluded status, output = self.target.run('dnf list --installed | grep %s'% excludepkg , 1500) self.assertEqual(1, status, "%s was not excluded, is listed as installed"%excludepkg) diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py b/meta/lib/oeqa/runtime/cases/logrotate.py index 992fef2989..2a69d83364 100644 --- a/meta/lib/oeqa/runtime/cases/logrotate.py +++ b/meta/lib/oeqa/runtime/cases/logrotate.py @@ -9,8 +9,12 @@ from oeqa.runtime.decorator.package import OEHasPackage class LogrotateTest(OERuntimeTestCase): @classmethod + def setUpClass(cls): + cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak') + + @classmethod def tearDownClass(cls): - cls.tc.target.run('rm -rf $HOME/logrotate_dir') + cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf $HOME/logrotate_dir') @OETestID(1544) @OETestDepends(['ssh.SSHTest.test_ssh']) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 0ce90a4af9..9eb9badf84 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -78,7 +78,57 @@ def tearDownModule(): class DevtoolBase(OESelftestTestCase): - buffer = True + @classmethod + def setUpClass(cls): + super(DevtoolBase, cls).setUpClass() + bb_vars = get_bb_vars(['TOPDIR', 'SSTATE_DIR']) + cls.original_sstate = bb_vars['SSTATE_DIR'] + cls.devtool_sstate = os.path.join(bb_vars['TOPDIR'], 'sstate_devtool') + cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate + cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' + % cls.original_sstate) + + @classmethod + def tearDownClass(cls): + cls.logger.debug('Deleting devtool sstate cache on %s' % cls.devtool_sstate) + runCmd('rm -rf %s' % cls.devtool_sstate) + super(DevtoolBase, cls).tearDownClass() + + def setUp(self): + """Test case setup function""" + super(DevtoolBase, self).setUp() + self.workspacedir = os.path.join(self.builddir, 'workspace') + self.assertTrue(not os.path.exists(self.workspacedir), + 'This test cannot be run with a workspace directory ' + 'under the build directory') + self.append_config(self.sstate_conf) + + def _check_src_repo(self, repo_dir): + """Check srctree git repository""" + self.assertTrue(os.path.isdir(os.path.join(repo_dir, '.git')), + 'git repository for external source tree not found') + result = runCmd('git status --porcelain', cwd=repo_dir) + self.assertEqual(result.output.strip(), "", + 'Created git repo is not clean') + result = runCmd('git symbolic-ref HEAD', cwd=repo_dir) + self.assertEqual(result.output.strip(), "refs/heads/devtool", + 'Wrong branch in git repo') + + def _check_repo_status(self, repo_dir, expected_status): + """Check the worktree status of a repository""" + result = runCmd('git status . --porcelain', + cwd=repo_dir) + for line in result.output.splitlines(): + for ind, (f_status, fn_re) in enumerate(expected_status): + if re.match(fn_re, line[3:]): + if f_status != line[:2]: + self.fail('Unexpected status in line: %s' % line) + expected_status.pop(ind) + break + else: + self.fail('Unexpected modified file in line: %s' % line) + if expected_status: + self.fail('Missing file changes: %s' % expected_status) def _test_recipe_contents(self, recipefile, checkvars, checkinherits): with open(recipefile, 'r') as f: @@ -183,58 +233,6 @@ class DevtoolBase(OESelftestTestCase): class DevtoolTests(DevtoolBase): - @classmethod - def setUpClass(cls): - super(DevtoolTests, cls).setUpClass() - bb_vars = get_bb_vars(['TOPDIR', 'SSTATE_DIR']) - cls.original_sstate = bb_vars['SSTATE_DIR'] - cls.devtool_sstate = os.path.join(bb_vars['TOPDIR'], 'sstate_devtool') - cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate - cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' - % cls.original_sstate) - - @classmethod - def tearDownClass(cls): - cls.logger.debug('Deleting devtool sstate cache on %s' % cls.devtool_sstate) - runCmd('rm -rf %s' % cls.devtool_sstate) - super(DevtoolTests, cls).tearDownClass() - - def setUp(self): - """Test case setup function""" - super(DevtoolTests, self).setUp() - self.workspacedir = os.path.join(self.builddir, 'workspace') - self.assertTrue(not os.path.exists(self.workspacedir), - 'This test cannot be run with a workspace directory ' - 'under the build directory') - self.append_config(self.sstate_conf) - - def _check_src_repo(self, repo_dir): - """Check srctree git repository""" - self.assertTrue(os.path.isdir(os.path.join(repo_dir, '.git')), - 'git repository for external source tree not found') - result = runCmd('git status --porcelain', cwd=repo_dir) - self.assertEqual(result.output.strip(), "", - 'Created git repo is not clean') - result = runCmd('git symbolic-ref HEAD', cwd=repo_dir) - self.assertEqual(result.output.strip(), "refs/heads/devtool", - 'Wrong branch in git repo') - - def _check_repo_status(self, repo_dir, expected_status): - """Check the worktree status of a repository""" - result = runCmd('git status . --porcelain', - cwd=repo_dir) - for line in result.output.splitlines(): - for ind, (f_status, fn_re) in enumerate(expected_status): - if re.match(fn_re, line[3:]): - if f_status != line[:2]: - self.fail('Unexpected status in line: %s' % line) - expected_status.pop(ind) - break - else: - self.fail('Unexpected modified file in line: %s' % line) - if expected_status: - self.fail('Missing file changes: %s' % expected_status) - @OETestID(1158) def test_create_workspace(self): # Check preconditions @@ -256,6 +254,8 @@ class DevtoolTests(DevtoolBase): self.assertNotIn(tempdir, result.output) self.assertIn(self.workspacedir, result.output) +class DevtoolAddTests(DevtoolBase): + @OETestID(1159) def test_devtool_add(self): # Fetch source @@ -300,6 +300,8 @@ class DevtoolTests(DevtoolBase): @OETestID(1423) def test_devtool_add_git_local(self): + # We need dbus built so that DEPENDS recognition works + bitbake('dbus') # Fetch source from a remote URL, but do it outside of devtool tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) @@ -509,6 +511,8 @@ class DevtoolTests(DevtoolBase): checkvars['SRC_URI'] = url.replace(testver, '${PV}') self._test_recipe_contents(recipefile, checkvars, []) +class DevtoolModifyTests(DevtoolBase): + @OETestID(1164) def test_devtool_modify(self): import oe.path @@ -754,6 +758,7 @@ class DevtoolTests(DevtoolBase): self._check_src_repo(tempdir) # This is probably sufficient +class DevtoolUpdateTests(DevtoolBase): @OETestID(1169) def test_devtool_update_recipe(self): @@ -1170,6 +1175,8 @@ class DevtoolTests(DevtoolBase): expected_status = [] self._check_repo_status(os.path.dirname(recipefile), expected_status) +class DevtoolExtractTests(DevtoolBase): + @OETestID(1163) def test_devtool_extract(self): tempdir = tempfile.mkdtemp(prefix='devtoolqa') @@ -1339,6 +1346,8 @@ class DevtoolTests(DevtoolBase): if reqpkgs: self.fail('The following packages were not present in the image as expected: %s' % ', '.join(reqpkgs)) +class DevtoolUpgradeTests(DevtoolBase): + @OETestID(1367) def test_devtool_upgrade(self): # Check preconditions diff --git a/meta/lib/oeqa/selftest/cases/efibootpartition.py b/meta/lib/oeqa/selftest/cases/efibootpartition.py index 0c83256696..c6f39d5b16 100644 --- a/meta/lib/oeqa/selftest/cases/efibootpartition.py +++ b/meta/lib/oeqa/selftest/cases/efibootpartition.py @@ -11,7 +11,6 @@ from oeqa.utils.commands import bitbake, runqemu, get_bb_var class GenericEFITest(OESelftestTestCase): """EFI booting test class""" - buffer = True cmd_common = "runqemu nographic serial wic ovmf" efi_provider = "systemd-boot" image = "core-image-minimal" diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 09e0b20625..cdfd74b447 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -10,8 +10,6 @@ class ImageFeatures(OESelftestTestCase): test_user = 'tester' root_user = 'root' - buffer = True - @OETestID(1107) def test_non_root_user_can_connect_via_ssh_without_password(self): """ diff --git a/meta/lib/oeqa/selftest/cases/pkgdata.py b/meta/lib/oeqa/selftest/cases/pkgdata.py index 0b4caf1b2c..99117651e5 100644 --- a/meta/lib/oeqa/selftest/cases/pkgdata.py +++ b/meta/lib/oeqa/selftest/cases/pkgdata.py @@ -13,6 +13,7 @@ class OePkgdataUtilTests(OESelftestTestCase): super(OePkgdataUtilTests, cls).setUpClass() # Ensure we have the right data in pkgdata cls.logger.info('Running bitbake to generate pkgdata') + bitbake('target-sdk-provides-dummy -c clean') bitbake('busybox zlib m4') @OETestID(1203) diff --git a/meta/lib/oeqa/selftest/cases/resulttooltests.py b/meta/lib/oeqa/selftest/cases/resulttooltests.py new file mode 100644 index 0000000000..0a089c0b7f --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/resulttooltests.py @@ -0,0 +1,94 @@ +import os +import sys +basepath = os.path.abspath(os.path.dirname(__file__) + '/../../../../../') +lib_path = basepath + '/scripts/lib' +sys.path = sys.path + [lib_path] +from resulttool.report import ResultsTextReport +from resulttool import regression as regression +from resulttool import resultutils as resultutils +from oeqa.selftest.case import OESelftestTestCase + +class ResultToolTests(OESelftestTestCase): + base_results_data = {'base_result1': {'configuration': {"TEST_TYPE": "runtime", + "TESTSERIES": "series1", + "IMAGE_BASENAME": "image", + "IMAGE_PKGTYPE": "ipk", + "DISTRO": "mydistro", + "MACHINE": "qemux86"}, + 'result': {}}, + 'base_result2': {'configuration': {"TEST_TYPE": "runtime", + "TESTSERIES": "series1", + "IMAGE_BASENAME": "image", + "IMAGE_PKGTYPE": "ipk", + "DISTRO": "mydistro", + "MACHINE": "qemux86-64"}, + 'result': {}}} + target_results_data = {'target_result1': {'configuration': {"TEST_TYPE": "runtime", + "TESTSERIES": "series1", + "IMAGE_BASENAME": "image", + "IMAGE_PKGTYPE": "ipk", + "DISTRO": "mydistro", + "MACHINE": "qemux86"}, + 'result': {}}, + 'target_result2': {'configuration': {"TEST_TYPE": "runtime", + "TESTSERIES": "series1", + "IMAGE_BASENAME": "image", + "IMAGE_PKGTYPE": "ipk", + "DISTRO": "mydistro", + "MACHINE": "qemux86"}, + 'result': {}}, + 'target_result3': {'configuration': {"TEST_TYPE": "runtime", + "TESTSERIES": "series1", + "IMAGE_BASENAME": "image", + "IMAGE_PKGTYPE": "ipk", + "DISTRO": "mydistro", + "MACHINE": "qemux86-64"}, + 'result': {}}} + + def test_report_can_aggregate_test_result(self): + result_data = {'result': {'test1': {'status': 'PASSED'}, + 'test2': {'status': 'PASSED'}, + 'test3': {'status': 'FAILED'}, + 'test4': {'status': 'ERROR'}, + 'test5': {'status': 'SKIPPED'}}} + report = ResultsTextReport() + result_report = report.get_aggregated_test_result(None, result_data) + self.assertTrue(result_report['passed'] == 2, msg="Passed count not correct:%s" % result_report['passed']) + self.assertTrue(result_report['failed'] == 2, msg="Failed count not correct:%s" % result_report['failed']) + self.assertTrue(result_report['skipped'] == 1, msg="Skipped count not correct:%s" % result_report['skipped']) + + def test_regression_can_get_regression_base_target_pair(self): + + results = {} + resultutils.append_resultsdata(results, ResultToolTests.base_results_data) + resultutils.append_resultsdata(results, ResultToolTests.target_results_data) + self.assertTrue('target_result1' in results['runtime/mydistro/qemux86/image'], msg="Pair not correct:%s" % results) + self.assertTrue('target_result3' in results['runtime/mydistro/qemux86-64/image'], msg="Pair not correct:%s" % results) + + def test_regrresion_can_get_regression_result(self): + base_result_data = {'result': {'test1': {'status': 'PASSED'}, + 'test2': {'status': 'PASSED'}, + 'test3': {'status': 'FAILED'}, + 'test4': {'status': 'ERROR'}, + 'test5': {'status': 'SKIPPED'}}} + target_result_data = {'result': {'test1': {'status': 'PASSED'}, + 'test2': {'status': 'FAILED'}, + 'test3': {'status': 'PASSED'}, + 'test4': {'status': 'ERROR'}, + 'test5': {'status': 'SKIPPED'}}} + result, text = regression.compare_result(self.logger, "BaseTestRunName", "TargetTestRunName", base_result_data, target_result_data) + self.assertTrue(result['test2']['base'] == 'PASSED', + msg="regression not correct:%s" % result['test2']['base']) + self.assertTrue(result['test2']['target'] == 'FAILED', + msg="regression not correct:%s" % result['test2']['target']) + self.assertTrue(result['test3']['base'] == 'FAILED', + msg="regression not correct:%s" % result['test3']['base']) + self.assertTrue(result['test3']['target'] == 'PASSED', + msg="regression not correct:%s" % result['test3']['target']) + + def test_merge_can_merged_results(self): + results = {} + resultutils.append_resultsdata(results, ResultToolTests.base_results_data, configmap=resultutils.flatten_map) + resultutils.append_resultsdata(results, ResultToolTests.target_results_data, configmap=resultutils.flatten_map) + self.assertEqual(len(results[''].keys()), 5, msg="Flattened results not correct %s" % str(results)) + diff --git a/meta/lib/oeqa/selftest/cases/runqemu.py b/meta/lib/oeqa/selftest/cases/runqemu.py index 8f4084d4b4..a23a1d8735 100644 --- a/meta/lib/oeqa/selftest/cases/runqemu.py +++ b/meta/lib/oeqa/selftest/cases/runqemu.py @@ -15,8 +15,6 @@ class RunqemuTests(OESelftestTestCase): image_is_ready = False deploy_dir_image = '' - # We only want to print runqemu stdout/stderr if there is a test case failure - buffer = True def setUpLocal(self): super(RunqemuTests, self).setUpLocal() diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index da7f26b30f..cac9869f10 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -159,7 +159,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): os.chdir(builddir) if not "meta-selftest" in self.tc.td["BBLAYERS"]: - self.tc.logger.warn("meta-selftest layer not found in BBLAYERS, adding it") + self.tc.logger.warning("meta-selftest layer not found in BBLAYERS, adding it") meta_selftestdir = os.path.join( self.tc.td["BBLAYERS_FETCH_DIR"], 'meta-selftest') if os.path.isdir(meta_selftestdir): diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py new file mode 100644 index 0000000000..9520b2e126 --- /dev/null +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -0,0 +1,244 @@ +# +# Helper functions for committing data to git and pushing upstream +# +# Copyright (c) 2017, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# + +import os +import re +import sys +from operator import attrgetter +from collections import namedtuple +from oeqa.utils.git import GitRepo, GitError + +class ArchiveError(Exception): + """Internal error handling of this script""" + +def format_str(string, fields): + """Format string using the given fields (dict)""" + try: + return string.format(**fields) + except KeyError as err: + raise ArchiveError("Unable to expand string '{}': unknown field {} " + "(valid fields are: {})".format( + string, err, ', '.join(sorted(fields.keys())))) + + +def init_git_repo(path, no_create, bare, log): + """Initialize local Git repository""" + path = os.path.abspath(path) + if os.path.isfile(path): + raise ArchiveError("Invalid Git repo at {}: path exists but is not a " + "directory".format(path)) + if not os.path.isdir(path) or not os.listdir(path): + if no_create: + raise ArchiveError("No git repo at {}, refusing to create " + "one".format(path)) + if not os.path.isdir(path): + try: + os.mkdir(path) + except (FileNotFoundError, PermissionError) as err: + raise ArchiveError("Failed to mkdir {}: {}".format(path, err)) + if not os.listdir(path): + log.info("Initializing a new Git repo at %s", path) + repo = GitRepo.init(path, bare) + try: + repo = GitRepo(path, is_topdir=True) + except GitError: + raise ArchiveError("Non-empty directory that is not a Git repository " + "at {}\nPlease specify an existing Git repository, " + "an empty directory or a non-existing directory " + "path.".format(path)) + return repo + + +def git_commit_data(repo, data_dir, branch, message, exclude, notes, log): + """Commit data into a Git repository""" + log.info("Committing data into to branch %s", branch) + tmp_index = os.path.join(repo.git_dir, 'index.oe-git-archive') + try: + # Create new tree object from the data + env_update = {'GIT_INDEX_FILE': tmp_index, + 'GIT_WORK_TREE': os.path.abspath(data_dir)} + repo.run_cmd('add .', env_update) + + # Remove files that are excluded + if exclude: + repo.run_cmd(['rm', '--cached'] + [f for f in exclude], env_update) + + tree = repo.run_cmd('write-tree', env_update) + + # Create new commit object from the tree + parent = repo.rev_parse(branch) + if not parent: + parent = repo.rev_parse("origin/" + branch) + git_cmd = ['commit-tree', tree, '-m', message] + if parent: + git_cmd += ['-p', parent] + commit = repo.run_cmd(git_cmd, env_update) + + # Create git notes + for ref, filename in notes: + ref = ref.format(branch_name=branch) + repo.run_cmd(['notes', '--ref', ref, 'add', + '-F', os.path.abspath(filename), commit]) + + # Update branch head + git_cmd = ['update-ref', 'refs/heads/' + branch, commit] + repo.run_cmd(git_cmd) + + # Update current HEAD, if we're on branch 'branch' + if not repo.bare and repo.get_current_branch() == branch: + log.info("Updating %s HEAD to latest commit", repo.top_dir) + repo.run_cmd('reset --hard') + + return commit + finally: + if os.path.exists(tmp_index): + os.unlink(tmp_index) + + +def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, + keywords): + """Generate tag name and message, with support for running id number""" + keyws = keywords.copy() + # Tag number is handled specially: if not defined, we autoincrement it + if 'tag_number' not in keyws: + # Fill in all other fields than 'tag_number' + keyws['tag_number'] = '{tag_number}' + tag_re = format_str(name_pattern, keyws) + # Replace parentheses for proper regex matching + tag_re = tag_re.replace('(', '\(').replace(')', '\)') + '$' + # Inject regex group pattern for 'tag_number' + tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') + + keyws['tag_number'] = 0 + for existing_tag in repo.run_cmd('tag').splitlines(): + match = re.match(tag_re, existing_tag) + + if match and int(match.group('tag_number')) >= keyws['tag_number']: + keyws['tag_number'] = int(match.group('tag_number')) + 1 + + tag_name = format_str(name_pattern, keyws) + msg_subj= format_str(msg_subj_pattern.strip(), keyws) + msg_body = format_str(msg_body_pattern, keyws) + return tag_name, msg_subj + '\n\n' + msg_body + +def gitarchive(data_dir, git_dir, no_create, bare, commit_msg_subject, commit_msg_body, branch_name, no_tag, tagname, tag_msg_subject, tag_msg_body, exclude, notes, push, keywords, log): + + if not os.path.isdir(data_dir): + raise ArchiveError("Not a directory: {}".format(data_dir)) + + data_repo = init_git_repo(git_dir, no_create, bare, log) + + # Expand strings early in order to avoid getting into inconsistent + # state (e.g. no tag even if data was committed) + commit_msg = format_str(commit_msg_subject.strip(), keywords) + commit_msg += '\n\n' + format_str(commit_msg_body, keywords) + branch_name = format_str(branch_name, keywords) + tag_name = None + if not no_tag and tagname: + tag_name, tag_msg = expand_tag_strings(data_repo, tagname, + tag_msg_subject, + tag_msg_body, keywords) + + # Commit data + commit = git_commit_data(data_repo, data_dir, branch_name, + commit_msg, exclude, notes, log) + + # Create tag + if tag_name: + log.info("Creating tag %s", tag_name) + data_repo.run_cmd(['tag', '-a', '-m', tag_msg, tag_name, commit]) + + # Push data to remote + if push: + cmd = ['push', '--tags'] + # If no remote is given we push with the default settings from + # gitconfig + if push is not True: + notes_refs = ['refs/notes/' + ref.format(branch_name=branch_name) + for ref, _ in notes] + cmd.extend([push, branch_name] + notes_refs) + log.info("Pushing data to remote") + data_repo.run_cmd(cmd) + +# Container class for tester revisions +TestedRev = namedtuple('TestedRev', 'commit commit_number tags') + +def get_test_runs(log, repo, tag_name, **kwargs): + """Get a sorted list of test runs, matching given pattern""" + # First, get field names from the tag name pattern + field_names = [m.group(1) for m in re.finditer(r'{(\w+)}', tag_name)] + undef_fields = [f for f in field_names if f not in kwargs.keys()] + + # Fields for formatting tag name pattern + str_fields = dict([(f, '*') for f in field_names]) + str_fields.update(kwargs) + + # Get a list of all matching tags + tag_pattern = tag_name.format(**str_fields) + tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines() + log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) + + # Parse undefined fields from tag names + str_fields = dict([(f, r'(?P<{}>[\w\-.()]+)'.format(f)) for f in field_names]) + str_fields['branch'] = r'(?P<branch>[\w\-.()/]+)' + str_fields['commit'] = '(?P<commit>[0-9a-f]{7,40})' + str_fields['commit_number'] = '(?P<commit_number>[0-9]{1,7})' + str_fields['tag_number'] = '(?P<tag_number>[0-9]{1,5})' + # escape parenthesis in fields in order to not messa up the regexp + fixed_fields = dict([(k, v.replace('(', r'\(').replace(')', r'\)')) for k, v in kwargs.items()]) + str_fields.update(fixed_fields) + tag_re = re.compile(tag_name.format(**str_fields)) + + # Parse fields from tags + revs = [] + for tag in tags: + m = tag_re.match(tag) + groups = m.groupdict() + revs.append([groups[f] for f in undef_fields] + [tag]) + + # Return field names and a sorted list of revs + return undef_fields, sorted(revs) + +def get_test_revs(log, repo, tag_name, **kwargs): + """Get list of all tested revisions""" + fields, runs = get_test_runs(log, repo, tag_name, **kwargs) + + revs = {} + commit_i = fields.index('commit') + commit_num_i = fields.index('commit_number') + for run in runs: + commit = run[commit_i] + commit_num = run[commit_num_i] + tag = run[-1] + if not commit in revs: + revs[commit] = TestedRev(commit, commit_num, [tag]) + else: + assert commit_num == revs[commit].commit_number, "Commit numbers do not match" + revs[commit].tags.append(tag) + + # Return in sorted table + revs = sorted(revs.values(), key=attrgetter('commit_number')) + log.debug("Found %d tested revisions:\n %s", len(revs), + "\n ".join(['{} ({})'.format(rev.commit_number, rev.commit) for rev in revs])) + return revs + +def rev_find(revs, attr, val): + """Search from a list of TestedRev""" + for i, rev in enumerate(revs): + if getattr(rev, attr) == val: + return i + raise ValueError("Unable to find '{}' value '{}'".format(attr, val)) + diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 27c4901d12..4864df84dd 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -393,7 +393,7 @@ class QemuRunner: # qemu-system behaves well and a SIGTERM is enough os.kill(self.qemupid, signal.SIGTERM) except ProcessLookupError as e: - self.logger.warn('qemu-system ended unexpectedly') + self.logger.warning('qemu-system ended unexpectedly') def stop_thread(self): if self.thread and self.thread.is_alive(): @@ -470,7 +470,7 @@ class QemuRunner: def _dump_host(self): self.host_dumper.create_dir("qemu") - self.logger.warn("Qemu ended unexpectedly, dump data from host" + self.logger.warning("Qemu ended unexpectedly, dump data from host" " is in %s" % self.host_dumper.dump_dir) self.host_dumper.dump_host() diff --git a/meta/recipes-core/busybox/busybox/CVE-2011-5325-fix.patch b/meta/recipes-core/busybox/busybox/CVE-2011-5325-fix.patch new file mode 100644 index 0000000000..a8d7e4bd50 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2011-5325-fix.patch @@ -0,0 +1,393 @@ +From 3e1e224fd031ae3927acda70f6e1fa55193e5b68 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Tue, 20 Feb 2018 15:57:45 +0100 +Subject: [PATCH] tar,unzip: postpone creation of symlinks with "suspicious" + targets + +This mostly reverts commit bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7 +"libarchive: do not extract unsafe symlinks unless $EXTRACT_UNSAFE_SYMLINKS=1" + +Users report that it is somewhat too restrictive. See +https://bugs.busybox.net/show_bug.cgi?id=8411 + +In particular, this interferes with unpacking of busybox-based +filesystems with links like "sbin/applet" -> "../bin/busybox". + +The change is made smaller by deleting ARCHIVE_EXTRACT_QUIET flag - +it is unused since 2010, and removing conditionals on it +allows commonalizing some error message codes. + +function old new delta +create_or_remember_symlink - 94 +94 +create_symlinks_from_list - 64 +64 +tar_main 1002 1006 +4 +unzip_main 2732 2724 -8 +data_extract_all 984 891 -93 +unsafe_symlink_target 147 - -147 +------------------------------------------------------------------------------ +(add/remove: 2/1 grow/shrink: 1/2 up/down: 162/-248) Total: -86 bytes + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> + +Upstream-Status: Backport from 1.28.2 [https://git.busybox.net/busybox/commit/?h=1_28_stable&id=37277a23fe48b13313f5d96084d890ed21d5fd8b] + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + archival/libarchive/data_extract_all.c | 50 +++++++++------- + archival/libarchive/unsafe_symlink_target.c | 63 +++++++++------------ + archival/tar.c | 2 + + archival/unzip.c | 29 ++++++---- + include/bb_archive.h | 23 +++++--- + testsuite/tar.tests | 10 ++-- + 6 files changed, 95 insertions(+), 82 deletions(-) + +diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c +index b828b656d..dad8d7d87 100644 +--- a/archival/libarchive/data_extract_all.c ++++ b/archival/libarchive/data_extract_all.c +@@ -108,9 +108,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + } + } + else if (existing_sb.st_mtime >= file_header->mtime) { +- if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- && !S_ISDIR(file_header->mode) +- ) { ++ if (!S_ISDIR(file_header->mode)) { + bb_error_msg("%s not created: newer or " + "same age file exists", dst_name); + } +@@ -126,7 +124,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + /* Handle hard links separately */ + if (hard_link) { + res = link(hard_link, dst_name); +- if (res != 0 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { ++ if (res != 0) { + /* shared message */ + bb_perror_msg("can't create %slink '%s' to '%s'", + "hard", dst_name, hard_link +@@ -166,10 +164,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + } + case S_IFDIR: + res = mkdir(dst_name, file_header->mode); +- if ((res == -1) ++ if ((res != 0) + && (errno != EISDIR) /* btw, Linux doesn't return this */ + && (errno != EEXIST) +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) + ) { + bb_perror_msg("can't make dir %s", dst_name); + } +@@ -177,27 +174,38 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) + case S_IFLNK: + /* Symlink */ + //TODO: what if file_header->link_target == NULL (say, corrupted tarball?) +- if (!unsafe_symlink_target(file_header->link_target)) { +- res = symlink(file_header->link_target, dst_name); +- if (res != 0 +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- ) { +- /* shared message */ +- bb_perror_msg("can't create %slink '%s' to '%s'", +- "sym", +- dst_name, file_header->link_target +- ); +- } +- } ++ ++ /* To avoid a directory traversal attack via symlinks, ++ * do not restore symlinks with ".." components ++ * or symlinks starting with "/", unless a magic ++ * envvar is set. ++ * ++ * For example, consider a .tar created via: ++ * $ tar cvf bug.tar anything.txt ++ * $ ln -s /tmp symlink ++ * $ tar --append -f bug.tar symlink ++ * $ rm symlink ++ * $ mkdir symlink ++ * $ tar --append -f bug.tar symlink/evil.py ++ * ++ * This will result in an archive that contains: ++ * $ tar --list -f bug.tar ++ * anything.txt ++ * symlink [-> /tmp] ++ * symlink/evil.py ++ * ++ * Untarring bug.tar would otherwise place evil.py in '/tmp'. ++ */ ++ create_or_remember_symlink(&archive_handle->symlink_placeholders, ++ file_header->link_target, ++ dst_name); + break; + case S_IFSOCK: + case S_IFBLK: + case S_IFCHR: + case S_IFIFO: + res = mknod(dst_name, file_header->mode, file_header->device); +- if ((res == -1) +- && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) +- ) { ++ if (res != 0) { + bb_perror_msg("can't create node %s", dst_name); + } + break; +diff --git a/archival/libarchive/unsafe_symlink_target.c b/archival/libarchive/unsafe_symlink_target.c +index ee46e28f8..8dcafeaa1 100644 +--- a/archival/libarchive/unsafe_symlink_target.c ++++ b/archival/libarchive/unsafe_symlink_target.c +@@ -5,44 +5,37 @@ + #include "libbb.h" + #include "bb_archive.h" + +-int FAST_FUNC unsafe_symlink_target(const char *target) ++void FAST_FUNC create_or_remember_symlink(llist_t **symlink_placeholders, ++ const char *target, ++ const char *linkname) + { +- const char *dot; +- +- if (target[0] == '/') { +- const char *var; +-unsafe: +- var = getenv("EXTRACT_UNSAFE_SYMLINKS"); +- if (var) { +- if (LONE_CHAR(var, '1')) +- return 0; /* pretend it's safe */ +- return 1; /* "UNSAFE!" */ +- } +- bb_error_msg("skipping unsafe symlink to '%s' in archive," +- " set %s=1 to extract", +- target, +- "EXTRACT_UNSAFE_SYMLINKS" ++ if (target[0] == '/' || strstr(target, "..")) { ++ llist_add_to(symlink_placeholders, ++ xasprintf("%s%c%s", linkname, '\0', target) ++ ); ++ return; ++ } ++ if (symlink(target, linkname) != 0) { ++ /* shared message */ ++ bb_perror_msg_and_die("can't create %slink '%s' to '%s'", ++ "sym", linkname, target + ); +- /* Prevent further messages */ +- setenv("EXTRACT_UNSAFE_SYMLINKS", "0", 0); +- return 1; /* "UNSAFE!" */ + } ++} + +- dot = target; +- for (;;) { +- dot = strchr(dot, '.'); +- if (!dot) +- return 0; /* safe target */ ++void FAST_FUNC create_symlinks_from_list(llist_t *list) ++{ ++ while (list) { ++ char *target; + +- /* Is it a path component starting with ".."? */ +- if ((dot[1] == '.') +- && (dot == target || dot[-1] == '/') +- /* Is it exactly ".."? */ +- && (dot[2] == '/' || dot[2] == '\0') +- ) { +- goto unsafe; +- } +- /* NB: it can even be trailing ".", should only add 1 */ +- dot += 1; ++ target = list->data + strlen(list->data) + 1; ++ if (symlink(target, list->data)) { ++ /* shared message */ ++ bb_error_msg_and_die("can't create %slink '%s' to '%s'", ++ "sym", ++ list->data, target ++ ); ++ } ++ list = list->link; + } +-} +\ No newline at end of file ++} +diff --git a/archival/tar.c b/archival/tar.c +index 7598b71e3..bde86330c 100644 +--- a/archival/tar.c ++++ b/archival/tar.c +@@ -1252,6 +1252,8 @@ int tar_main(int argc UNUSED_PARAM, char **argv) + while (get_header_tar(tar_handle) == EXIT_SUCCESS) + bb_got_signal = EXIT_SUCCESS; /* saw at least one header, good */ + ++ create_symlinks_from_list(tar_handle->symlink_placeholders); ++ + /* Check that every file that should have been extracted was */ + while (tar_handle->accept) { + if (!find_list_entry(tar_handle->reject, tar_handle->accept->data) +diff --git a/archival/unzip.c b/archival/unzip.c +index 270e261b7..2f53ab7a4 100644 +--- a/archival/unzip.c ++++ b/archival/unzip.c +@@ -335,7 +335,10 @@ static void unzip_create_leading_dirs(const char *fn) + free(name); + } + +-static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) ++#if ENABLE_FEATURE_UNZIP_CDF ++static void unzip_extract_symlink(llist_t **symlink_placeholders, ++ zip_header_t *zip, ++ const char *dst_fn) + { + char *target; + +@@ -361,17 +364,12 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn) + target[xstate.mem_output_size] = '\0'; + #endif + } +- if (!unsafe_symlink_target(target)) { +-//TODO: libbb candidate +- if (symlink(target, dst_fn)) { +- /* shared message */ +- bb_perror_msg_and_die("can't create %slink '%s' to '%s'", +- "sym", dst_fn, target +- ); +- } +- } ++ create_or_remember_symlink(symlink_placeholders, ++ target, ++ dst_fn); + free(target); + } ++#endif + + static void unzip_extract(zip_header_t *zip, int dst_fd) + { +@@ -464,6 +462,9 @@ int unzip_main(int argc, char **argv) + llist_t *zaccept = NULL; + llist_t *zreject = NULL; + char *base_dir = NULL; ++#if ENABLE_FEATURE_UNZIP_CDF ++ llist_t *symlink_placeholders = NULL; ++#endif + int i, opt; + char key_buf[80]; /* must match size used by my_fgets80 */ + struct stat stat_buf; +@@ -894,8 +895,8 @@ int unzip_main(int argc, char **argv) + } + #if ENABLE_FEATURE_UNZIP_CDF + if (S_ISLNK(file_mode)) { +- if (dst_fd != STDOUT_FILENO) /* no -p */ +- unzip_extract_symlink(&zip, dst_fn); ++ if (dst_fd != STDOUT_FILENO) /* not -p? */ ++ unzip_extract_symlink(&symlink_placeholders, &zip, dst_fn); + } else + #endif + { +@@ -931,6 +932,10 @@ int unzip_main(int argc, char **argv) + total_entries++; + } + ++#if ENABLE_FEATURE_UNZIP_CDF ++ create_symlinks_from_list(symlink_placeholders); ++#endif ++ + if (listing && quiet <= 1) { + if (!verbose) { + // " Length Date Time Name\n" +diff --git a/include/bb_archive.h b/include/bb_archive.h +index 1e4da3c33..436eb0fe3 100644 +--- a/include/bb_archive.h ++++ b/include/bb_archive.h +@@ -64,6 +64,9 @@ typedef struct archive_handle_t { + /* Currently processed file's header */ + file_header_t *file_header; + ++ /* List of symlink placeholders */ ++ llist_t *symlink_placeholders; ++ + /* Process the header component, e.g. tar -t */ + void FAST_FUNC (*action_header)(const file_header_t *); + +@@ -119,15 +122,14 @@ typedef struct archive_handle_t { + #define ARCHIVE_RESTORE_DATE (1 << 0) + #define ARCHIVE_CREATE_LEADING_DIRS (1 << 1) + #define ARCHIVE_UNLINK_OLD (1 << 2) +-#define ARCHIVE_EXTRACT_QUIET (1 << 3) +-#define ARCHIVE_EXTRACT_NEWER (1 << 4) +-#define ARCHIVE_DONT_RESTORE_OWNER (1 << 5) +-#define ARCHIVE_DONT_RESTORE_PERM (1 << 6) +-#define ARCHIVE_NUMERIC_OWNER (1 << 7) +-#define ARCHIVE_O_TRUNC (1 << 8) +-#define ARCHIVE_REMEMBER_NAMES (1 << 9) ++#define ARCHIVE_EXTRACT_NEWER (1 << 3) ++#define ARCHIVE_DONT_RESTORE_OWNER (1 << 4) ++#define ARCHIVE_DONT_RESTORE_PERM (1 << 5) ++#define ARCHIVE_NUMERIC_OWNER (1 << 6) ++#define ARCHIVE_O_TRUNC (1 << 7) ++#define ARCHIVE_REMEMBER_NAMES (1 << 8) + #if ENABLE_RPM +-#define ARCHIVE_REPLACE_VIA_RENAME (1 << 10) ++#define ARCHIVE_REPLACE_VIA_RENAME (1 << 9) + #endif + + +@@ -196,7 +198,10 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC; + void seek_by_read(int fd, off_t amount) FAST_FUNC; + + const char *strip_unsafe_prefix(const char *str) FAST_FUNC; +-int unsafe_symlink_target(const char *target) FAST_FUNC; ++void create_or_remember_symlink(llist_t **symlink_placeholders, ++ const char *target, ++ const char *linkname) FAST_FUNC; ++void create_symlinks_from_list(llist_t *list) FAST_FUNC; + + void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; + const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; +diff --git a/testsuite/tar.tests b/testsuite/tar.tests +index 127eeaaee..21cef49fe 100755 +--- a/testsuite/tar.tests ++++ b/testsuite/tar.tests +@@ -279,7 +279,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 + testing "tar does not extract into symlinks" "\ + >>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$? + " "\ +-tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract ++tar: can't create symlink 'passwd' to '/tmp/passwd' + 0 + " \ + "" "\ +@@ -299,7 +299,7 @@ optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2 + testing "tar -k does not extract into symlinks" "\ + >>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$? + " "\ +-tar: skipping unsafe symlink to '/tmp/passwd' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract ++tar: can't create symlink 'passwd' to '/tmp/passwd' + 0 + " \ + "" "\ +@@ -324,11 +324,11 @@ rm -rf etc usr + ' "\ + etc/ssl/certs/3b2716e5.0 + etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem +-tar: skipping unsafe symlink to '/usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract + etc/ssl/certs/f80cc7f6.0 + usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt + 0 + etc/ssl/certs/3b2716e5.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem ++etc/ssl/certs/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem -> /usr/share/ca-certificates/mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt + etc/ssl/certs/f80cc7f6.0 -> EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.pem + " \ + "" "" +@@ -346,9 +346,9 @@ ls symlink/bb_test_evilfile + ' "\ + anything.txt + symlink +-tar: skipping unsafe symlink to '/tmp' in archive, set EXTRACT_UNSAFE_SYMLINKS=1 to extract + symlink/bb_test_evilfile +-0 ++tar: can't create symlink 'symlink' to '/tmp' ++1 + ls: /tmp/bb_test_evilfile: No such file or directory + ls: bb_test_evilfile: No such file or directory + symlink/bb_test_evilfile +-- +2.17.1 + diff --git a/meta/recipes-core/busybox/busybox_1.27.2.bb b/meta/recipes-core/busybox/busybox_1.27.2.bb index bab29728ee..716a0650fc 100644 --- a/meta/recipes-core/busybox/busybox_1.27.2.bb +++ b/meta/recipes-core/busybox/busybox_1.27.2.bb @@ -43,6 +43,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://runlevel \ file://makefile-libbb-race.patch \ file://CVE-2011-5325.patch \ + file://CVE-2011-5325-fix.patch \ file://CVE-2017-15873.patch \ file://busybox-CVE-2017-16544.patch \ file://busybox-fix-lzma-segfaults.patch \ diff --git a/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch new file mode 100644 index 0000000000..110b34372d --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch @@ -0,0 +1,193 @@ +From 269a8987224ec62b7a9aa6202772b07d5be424d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de> +Date: Mon, 11 Mar 2019 16:00:33 +0100 +Subject: [PATCH 1/2] fflush: adjust to glibc 2.28 libio.h removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of patch: +4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Paul Eggert <eggert@cs.ucla.edu> +fflush: adjust to glibc 2.28 libio.h removal + +Upstream-Status: Backport [master] + +Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> +--- + lib/fflush.c | 6 +++--- + lib/fpending.c | 2 +- + lib/fpurge.c | 2 +- + lib/freadahead.c | 2 +- + lib/freading.c | 2 +- + lib/freadptr.c | 2 +- + lib/freadseek.c | 2 +- + lib/fseeko.c | 4 ++-- + lib/fseterr.c | 2 +- + lib/stdio-impl.h | 6 ++++++ + 10 files changed, 18 insertions(+), 12 deletions(-) + +diff --git a/lib/fflush.c b/lib/fflush.c +index 4e65692644b1..c16da5fdcf23 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,7 @@ + #undef fflush + + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/lib/fpending.c +index 5811a4a74750..9e21a165e220 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index 408b8fcbb3b8..3a160004d49d 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,7 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/lib/freadahead.c +index f335f041ee5e..e7cb77b6722b 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/lib/freading.c b/lib/freading.c +index 78140d27bfef..c9d33449e948 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,7 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/freadptr.c b/lib/freadptr.c +index e4cc0b02fba2..aba8dd5964fc 100644 +--- a/lib/freadptr.c ++++ b/lib/freadptr.c +@@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep) + size_t size; + + /* Keep this code in sync with freadahead! */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return NULL; + size = fp->_IO_read_end - fp->_IO_read_ptr; +diff --git a/lib/freadseek.c b/lib/freadseek.c +index fcecba6829c5..98726f845f88 100644 +--- a/lib/freadseek.c ++++ b/lib/freadseek.c +@@ -36,7 +36,7 @@ freadptrinc (FILE *fp, size_t increment) + /* Keep this code in sync with freadptr! */ + #if HAVE___FREADPTRINC /* musl libc */ + __freadptrinc (fp, increment); +-#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_ptr += increment; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fseeko.c b/lib/fseeko.c +index d0f24d8a838f..0ae2b153cff5 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index 739e5453d04e..d998619771f3 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,7 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h +index 329801ad23b0..eeaabab66b2f 100644 +--- a/lib/stdio-impl.h ++++ b/lib/stdio-impl.h +@@ -18,6 +18,12 @@ + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this ++ problem by defining it ourselves. FIXME: Do not rely on glibc ++ internals. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif + + /* BSD stdio derived implementations. */ + +-- +2.20.1 + diff --git a/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch new file mode 100644 index 0000000000..8cc7d63779 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch @@ -0,0 +1,187 @@ +From 72a2dae68c9101d80abdce8c4e41f7e562bd2399 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de> +Date: Wed, 13 Mar 2019 14:09:39 +0100 +Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of patch: +74d9d6a293d7462dea8f83e7fc5ac792e956a0ad +Paul Eggert <eggert@cs.ucla.edu> +fflush: be more paranoid about libio.h change + +Upstream-Status: Backport [master] + +Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> +--- + lib/fflush.c | 9 ++++++--- + lib/fpending.c | 3 ++- + lib/fpurge.c | 3 ++- + lib/freadahead.c | 3 ++- + lib/freading.c | 3 ++- + lib/freadptr.c | 3 ++- + lib/freadseek.c | 3 ++- + lib/fseeko.c | 6 ++++-- + lib/fseterr.c | 3 ++- + 9 files changed, 24 insertions(+), 12 deletions(-) + +diff --git a/lib/fflush.c b/lib/fflush.c +index c16da5fdcf23..b69206296e9a 100644 +--- a/lib/fflush.c ++++ b/lib/fflush.c +@@ -33,7 +33,8 @@ + #undef fflush + + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ + static void +@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp) + + #endif + +-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) ++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1) ++/* GNU libc, BeOS, Haiku, Linux libc5 */ + + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream) + if (stream == NULL || ! freading (stream)) + return fflush (stream); + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + + clear_ungetc_buffer_preserving_position (stream); + +diff --git a/lib/fpending.c b/lib/fpending.c +index 9e21a165e220..0c3b931dba9a 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,8 @@ __fpending (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index 3a160004d49d..4558ab9a0783 100644 +--- a/lib/fpurge.c ++++ b/lib/fpurge.c +@@ -62,7 +62,8 @@ fpurge (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_end = fp->_IO_read_ptr; + fp->_IO_write_ptr = fp->_IO_write_base; + /* Avoid memory leak when there is an active ungetc buffer. */ +diff --git a/lib/freadahead.c b/lib/freadahead.c +index e7cb77b6722b..496686042d1e 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *); + size_t + freadahead (FILE *fp) + { +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return 0; + return (fp->_IO_read_end - fp->_IO_read_ptr) +diff --git a/lib/freading.c b/lib/freading.c +index c9d33449e948..5e66df1dc7dd 100644 +--- a/lib/freading.c ++++ b/lib/freading.c +@@ -31,7 +31,8 @@ freading (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + return ((fp->_flags & _IO_NO_WRITES) != 0 + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 + && fp->_IO_read_base != NULL)); +diff --git a/lib/freadptr.c b/lib/freadptr.c +index aba8dd5964fc..e82b41e3f4d9 100644 +--- a/lib/freadptr.c ++++ b/lib/freadptr.c +@@ -29,7 +29,8 @@ freadptr (FILE *fp, size_t *sizep) + size_t size; + + /* Keep this code in sync with freadahead! */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_write_ptr > fp->_IO_write_base) + return NULL; + size = fp->_IO_read_end - fp->_IO_read_ptr; +diff --git a/lib/freadseek.c b/lib/freadseek.c +index 98726f845f88..f547bfd4257b 100644 +--- a/lib/freadseek.c ++++ b/lib/freadseek.c +@@ -36,7 +36,8 @@ freadptrinc (FILE *fp, size_t increment) + /* Keep this code in sync with freadptr! */ + #if HAVE___FREADPTRINC /* musl libc */ + __freadptrinc (fp, increment); +-#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_IO_read_ptr += increment; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fseeko.c b/lib/fseeko.c +index 0ae2b153cff5..ee8efa49ac34 100644 +--- a/lib/fseeko.c ++++ b/lib/fseeko.c +@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence) + #endif + + /* These tests are based on fpurge.c. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + if (fp->_IO_read_end == fp->_IO_read_ptr + && fp->_IO_write_ptr == fp->_IO_write_base + && fp->_IO_save_base == NULL) +@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence) + return -1; + } + +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ +diff --git a/lib/fseterr.c b/lib/fseterr.c +index d998619771f3..23f4e3593800 100644 +--- a/lib/fseterr.c ++++ b/lib/fseterr.c +@@ -29,7 +29,8 @@ fseterr (FILE *fp) + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++ /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +-- +2.20.1 + diff --git a/meta/recipes-core/coreutils/coreutils_8.29.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb index b0572afdc0..3c72bdd750 100644 --- a/meta/recipes-core/coreutils/coreutils_8.29.bb +++ b/meta/recipes-core/coreutils/coreutils_8.29.bb @@ -21,6 +21,8 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://0001-local.mk-fix-cross-compiling-problem.patch \ file://CVE-2017-18018-1.patch \ file://CVE-2017-18018-2.patch \ + file://0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch \ + file://0002-fflush-be-more-paranoid-about-libio.h-change.patch \ " SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303" diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 8ab59a9dd2..f6e8f62dfa 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "1566ecdb01216ece73864c15c781fdefe9af5e37" +SRCREV ?= "c10a028e270ff71471b4ba982f61ef64cb85ca55" SRC_URI = "git://git.yoctoproject.org/poky;branch=sumo \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch b/meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch new file mode 100644 index 0000000000..9a0b55f97d --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch @@ -0,0 +1,252 @@ +From 2da8ba3f507345d0401ea9d7191fa16ffa560ebc Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 19 Oct 2018 11:26:59 +0200 +Subject: [PATCH] chown-recursive: let's rework the recursive logic to use + O_PATH + +That way we can pin a specific inode and analyze it and manipulate it +without it being swapped out beneath our hands. + +Fixes a vulnerability originally found by Jann Horn from Google. + +CVE-2018-15687 +LP: #1796692 +https://bugzilla.redhat.com/show_bug.cgi?id=1639076 + +Origin: upstream, https://github.com/poettering/systemd/commit/5de6cce58b3e8b79239b6e83653459d91af6e57c +Bug-Ubuntu: https://launchpad.net/bugs/1796692 + +Patch for 237 from: +systemd_237-3ubuntu10.13.debian CVE-2018-15687.patch + +CVE: CVE-2018-15687 +Upstream-Status: Backport + +--- + src/core/chown-recursive.c | 146 ++++++++++++++++++++++----------------------- + 1 file changed, 70 insertions(+), 76 deletions(-) + +diff --git a/src/core/chown-recursive.c b/src/core/chown-recursive.c +index c479450..27c6448 100644 +--- a/src/core/chown-recursive.c ++++ b/src/core/chown-recursive.c +@@ -18,18 +18,20 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + +-#include <sys/types.h> +-#include <sys/stat.h> + #include <fcntl.h> ++#include <sys/stat.h> ++#include <sys/types.h> + +-#include "user-util.h" +-#include "macro.h" +-#include "fd-util.h" +-#include "dirent-util.h" + #include "chown-recursive.h" ++#include "dirent-util.h" ++#include "fd-util.h" ++#include "macro.h" ++#include "stdio-util.h" ++#include "strv.h" ++#include "user-util.h" + +-static int chown_one(int fd, const char *name, const struct stat *st, uid_t uid, gid_t gid) { +- int r; ++static int chown_one(int fd, const struct stat *st, uid_t uid, gid_t gid) { ++ char procfs_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int) + 1]; + + assert(fd >= 0); + assert(st); +@@ -38,90 +40,82 @@ + (!gid_is_valid(gid) || st->st_gid == gid)) + return 0; + +- if (name) +- r = fchownat(fd, name, uid, gid, AT_SYMLINK_NOFOLLOW); +- else +- r = fchown(fd, uid, gid); +- if (r < 0) +- return -errno; ++ /* We change ownership through the /proc/self/fd/%i path, so that we have a stable reference that works with ++ * O_PATH. (Note: fchown() and fchmod() do not work with O_PATH, the kernel refuses that. */ ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); + +- /* The linux kernel alters the mode in some cases of chown(). Let's undo this. */ +- if (name) { +- if (!S_ISLNK(st->st_mode)) +- r = fchmodat(fd, name, st->st_mode, 0); +- else /* There's currently no AT_SYMLINK_NOFOLLOW for fchmodat() */ +- r = 0; +- } else +- r = fchmod(fd, st->st_mode); +- if (r < 0) ++ if (chown(procfs_path, uid, gid) < 0) + return -errno; + ++ /* The linux kernel alters the mode in some cases of chown(). Let's undo this. We do this only for non-symlinks ++ * however. That's because for symlinks the access mode is ignored anyway and because on some kernels/file ++ * systems trying to change the access mode will succeed but has no effect while on others it actively ++ * fails. */ ++ if (!S_ISLNK(st->st_mode)) ++ if (chmod(procfs_path, st->st_mode & 07777) < 0) ++ return -errno; ++ + return 1; + } + + static int chown_recursive_internal(int fd, const struct stat *st, uid_t uid, gid_t gid) { ++ _cleanup_closedir_ DIR *d = NULL; + bool changed = false; ++ struct dirent *de; + int r; + + assert(fd >= 0); + assert(st); + +- if (S_ISDIR(st->st_mode)) { +- _cleanup_closedir_ DIR *d = NULL; +- struct dirent *de; +- +- d = fdopendir(fd); +- if (!d) { +- r = -errno; +- goto finish; +- } +- fd = -1; +- +- FOREACH_DIRENT_ALL(de, d, r = -errno; goto finish) { +- struct stat fst; +- +- if (dot_or_dot_dot(de->d_name)) +- continue; ++ d = fdopendir(fd); ++ if (!d) { ++ safe_close(fd); ++ return -errno; ++ } + +- if (fstatat(dirfd(d), de->d_name, &fst, AT_SYMLINK_NOFOLLOW) < 0) { +- r = -errno; +- goto finish; +- } +- +- if (S_ISDIR(fst.st_mode)) { +- int subdir_fd; +- +- subdir_fd = openat(dirfd(d), de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); +- if (subdir_fd < 0) { +- r = -errno; +- goto finish; +- } +- +- r = chown_recursive_internal(subdir_fd, &fst, uid, gid); +- if (r < 0) +- goto finish; +- if (r > 0) +- changed = true; +- } else { +- r = chown_one(dirfd(d), de->d_name, &fst, uid, gid); +- if (r < 0) +- goto finish; +- if (r > 0) +- changed = true; +- } ++ FOREACH_DIRENT_ALL(de, d, return -errno) { ++ _cleanup_close_ int path_fd = -1; ++ struct stat fst; ++ ++ if (dot_or_dot_dot(de->d_name)) ++ continue; ++ ++ /* Let's pin the child inode we want to fix now with an O_PATH fd, so that it cannot be swapped out ++ * while we manipulate it. */ ++ path_fd = openat(dirfd(d), de->d_name, O_PATH|O_CLOEXEC|O_NOFOLLOW); ++ if (path_fd < 0) ++ return -errno; ++ ++ if (fstat(path_fd, &fst) < 0) ++ return -errno; ++ ++ if (S_ISDIR(fst.st_mode)) { ++ int subdir_fd; ++ ++ /* Convert it to a "real" (i.e. non-O_PATH) fd now */ ++ subdir_fd = fd_reopen(path_fd, O_RDONLY|O_CLOEXEC|O_NOATIME); ++ if (subdir_fd < 0) ++ return subdir_fd; ++ ++ r = chown_recursive_internal(subdir_fd, &fst, uid, gid); /* takes possession of subdir_fd even on failure */ ++ if (r < 0) ++ return r; ++ if (r > 0) ++ changed = true; ++ } else { ++ r = chown_one(path_fd, &fst, uid, gid); ++ if (r < 0) ++ return r; ++ if (r > 0) ++ changed = true; + } ++ } + +- r = chown_one(dirfd(d), NULL, st, uid, gid); +- } else +- r = chown_one(fd, NULL, st, uid, gid); ++ r = chown_one(dirfd(d), st, uid, gid); + if (r < 0) +- goto finish; +- +- r = r > 0 || changed; ++ return r; + +-finish: +- safe_close(fd); +- return r; ++ return r > 0 || changed; + } + + int path_chown_recursive(const char *path, uid_t uid, gid_t gid) { +@@ -129,7 +123,7 @@ + struct stat st; + int r; + +- fd = open(path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); ++ fd = open(path, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); + if (fd < 0) + return -errno; + +--- a/src/basic/fd-util.c ++++ b/src/basic/fd-util.c +@@ -578,3 +578,22 @@ + + return -EOPNOTSUPP; + } ++ ++int fd_reopen(int fd, int flags) { ++ char procfs_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ int new_fd; ++ ++ /* Reopens the specified fd with new flags. This is useful for convert an O_PATH fd into a regular one, or to ++ * turn O_RDWR fds into O_RDONLY fds. ++ * ++ * This doesn't work on sockets (since they cannot be open()ed, ever). ++ * ++ * This implicitly resets the file read index to 0. */ ++ ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); ++ new_fd = open(procfs_path, flags); ++ if (new_fd < 0) ++ return -errno; ++ ++ return new_fd; ++} +--- a/src/basic/fd-util.h ++++ b/src/basic/fd-util.h +@@ -91,3 +91,5 @@ + /* Hint: ENETUNREACH happens if we try to connect to "non-existing" special IP addresses, such as ::5 */ + #define ERRNO_IS_DISCONNECT(r) \ + IN_SET(r, ENOTCONN, ECONNRESET, ECONNREFUSED, ECONNABORTED, EPIPE, ENETUNREACH) ++ ++int fd_reopen(int fd, int flags); diff --git a/meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch b/meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch new file mode 100644 index 0000000000..405300148a --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-core-when-deserializing-state-always-use-read_line-L.patch @@ -0,0 +1,250 @@ +From 56f77f7fcceea2fbb3b4efb8e307dd7784c63115 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Wed, 17 Oct 2018 18:36:24 +0200 +Subject: [PATCH] =?UTF-8?q?=3D=3FUTF-8=3Fq=3Fcore:=3D20when=3D20deserializ?= + =?UTF-8?q?ing=3D20state=3D20always=3F=3D?= + + =?UTF-8?q?=20use=20read=5Fline(=E2=80=A6,=20LONG=5FLINE=5FMAX,=20?= + =?UTF-8?q?=E2=80=A6)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This should be much better than fgets(), as we can read substantially +longer lines and overly long lines result in proper errors. + +Fixes a vulnerability discovered by Jann Horn at Google. + +CVE-2018-15686 +LP: #1796402 +https://bugzilla.redhat.com/show_bug.cgi?id=1639071 + +(cherry picked from commit 8948b3415d762245ebf5e19d80b97d4d8cc208c1) + +CVE: CVE-2018-15686 +Upstream-Status: Backport + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +--- + src/core/job.c | 19 +++++++++++-------- + src/core/manager.c | 44 ++++++++++++++++++++------------------------ + src/core/unit.c | 34 ++++++++++++++++++---------------- + src/core/unit.h | 2 +- + 4 files changed, 50 insertions(+), 49 deletions(-) + +diff --git a/src/core/job.c b/src/core/job.c +index c6de8d27e..e0f9cee2f 100644 +--- a/src/core/job.c ++++ b/src/core/job.c +@@ -28,6 +28,7 @@ + #include "dbus-job.h" + #include "dbus.h" + #include "escape.h" ++#include "fileio.h" + #include "job.h" + #include "log.h" + #include "macro.h" +@@ -1067,24 +1068,26 @@ int job_serialize(Job *j, FILE *f) { + } + + int job_deserialize(Job *j, FILE *f) { ++ int r; ++ + assert(j); + assert(f); + + for (;;) { +- char line[LINE_MAX], *l, *v; ++ _cleanup_free_ char *line = NULL; ++ char *l, *v; + size_t k; + +- if (!fgets(line, sizeof(line), f)) { +- if (feof(f)) +- return 0; +- return -errno; +- } ++ r = read_line(f, LONG_LINE_MAX, &line); ++ if (r < 0) ++ return log_error_errno(r, "Failed to read serialization line: %m"); ++ if (r == 0) ++ return 0; + +- char_array_0(line); + l = strstrip(line); + + /* End marker */ +- if (l[0] == 0) ++ if (isempty(l)) + return 0; + + k = strcspn(l, "="); +diff --git a/src/core/manager.c b/src/core/manager.c +index e837a46f5..423f82c94 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -2841,22 +2841,19 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { + m->n_reloading++; + + for (;;) { +- char line[LINE_MAX]; ++ _cleanup_free_ char *line = NULL; + const char *val, *l; + +- if (!fgets(line, sizeof(line), f)) { +- if (feof(f)) +- r = 0; +- else +- r = -errno; +- ++ r = read_line(f, LONG_LINE_MAX, &line); ++ if (r < 0) { ++ log_error_errno(r, "Failed to read serialization line: %m"); + goto finish; + } ++ if (r == 0) ++ break; + +- char_array_0(line); + l = strstrip(line); +- +- if (l[0] == 0) ++ if (isempty(l)) /* end marker */ + break; + + if ((val = startswith(l, "current-job-id="))) { +@@ -3003,29 +3000,31 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { + } + + for (;;) { +- Unit *u; +- char name[UNIT_NAME_MAX+2]; ++ _cleanup_free_ char *line = NULL; + const char* unit_name; ++ Unit *u; + + /* Start marker */ +- if (!fgets(name, sizeof(name), f)) { +- if (feof(f)) +- r = 0; +- else +- r = -errno; +- ++ r = read_line(f, LONG_LINE_MAX, &line); ++ if (r < 0) { ++ log_error_errno(r, "Failed to read serialization line: %m"); + goto finish; + } ++ if (r == 0) ++ break; + +- char_array_0(name); +- unit_name = strstrip(name); ++ unit_name = strstrip(line); + + r = manager_load_unit(m, unit_name, NULL, NULL, &u); + if (r < 0) { + log_notice_errno(r, "Failed to load unit \"%s\", skipping deserialization: %m", unit_name); + if (r == -ENOMEM) + goto finish; +- unit_deserialize_skip(f); ++ ++ r = unit_deserialize_skip(f); ++ if (r < 0) ++ goto finish; ++ + continue; + } + +@@ -3038,9 +3037,6 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { + } + + finish: +- if (ferror(f)) +- r = -EIO; +- + assert(m->n_reloading > 0); + m->n_reloading--; + +diff --git a/src/core/unit.c b/src/core/unit.c +index 932f05baa..4c3aa8e96 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -3346,21 +3346,19 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { + rt = (ExecRuntime**) ((uint8_t*) u + offset); + + for (;;) { +- char line[LINE_MAX], *l, *v; ++ _cleanup_free_ char *line = NULL; + CGroupIPAccountingMetric m; ++ char *l, *v; + size_t k; + +- if (!fgets(line, sizeof(line), f)) { +- if (feof(f)) +- return 0; +- return -errno; +- } ++ r = read_line(f, LONG_LINE_MAX, &line); ++ if (r < 0) ++ return log_error_errno(r, "Failed to read serialization line: %m"); ++ if (r == 0) /* eof */ ++ break; + +- char_array_0(line); + l = strstrip(line); +- +- /* End marker */ +- if (isempty(l)) ++ if (isempty(l)) /* End marker */ + break; + + k = strcspn(l, "="); +@@ -3637,23 +3635,27 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { + return 0; + } + +-void unit_deserialize_skip(FILE *f) { ++int unit_deserialize_skip(FILE *f) { ++ int r; + assert(f); + + /* Skip serialized data for this unit. We don't know what it is. */ + + for (;;) { +- char line[LINE_MAX], *l; ++ _cleanup_free_ char *line = NULL; ++ char *l; + +- if (!fgets(line, sizeof line, f)) +- return; ++ r = read_line(f, LONG_LINE_MAX, &line); ++ if (r < 0) ++ return log_error_errno(r, "Failed to read serialization line: %m"); ++ if (r == 0) ++ return 0; + +- char_array_0(line); + l = strstrip(line); + + /* End marker */ + if (isempty(l)) +- return; ++ return 1; + } + } + +diff --git a/src/core/unit.h b/src/core/unit.h +index 8c79d4ed2..08ad1c652 100644 +--- a/src/core/unit.h ++++ b/src/core/unit.h +@@ -689,7 +689,7 @@ bool unit_can_serialize(Unit *u) _pure_; + + int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs); + int unit_deserialize(Unit *u, FILE *f, FDSet *fds); +-void unit_deserialize_skip(FILE *f); ++int unit_deserialize_skip(FILE *f); + + int unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value); + int unit_serialize_item_escaped(Unit *u, FILE *f, const char *key, const char *value); diff --git a/meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch new file mode 100644 index 0000000000..0c912f25df --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch @@ -0,0 +1,39 @@ +From a2622b8398ba026faf481f5eddeb53231d9de4a7 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 19 Oct 2018 12:12:33 +0200 +Subject: [PATCH] dhcp6: make sure we have enough space for the DHCP6 option + header + +Fixes a vulnerability originally discovered by Felix Wilhelm from +Google. + +CVE-2018-15688 +LP: #1795921 +https://bugzilla.redhat.com/show_bug.cgi?id=1639067 + +(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) + +CVE: CVE-2018-15688 +Upstream-Status: Backport + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/libsystemd-network/dhcp6-option.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c +index c4b402b..dcbaad0 100644 +--- a/src/libsystemd-network/dhcp6-option.c ++++ b/src/libsystemd-network/dhcp6-option.c +@@ -103,7 +103,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) { + return -EINVAL; + } + +- if (*buflen < len) ++ if (*buflen < offsetof(DHCP6Option, data) + len) + return -ENOBUFS; + + ia_hdr = *buf; +-- +2.7.4 + diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles-don-t-resolve-pathnames-when-traversing-rec.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles-don-t-resolve-pathnames-when-traversing-rec.patch new file mode 100644 index 0000000000..108e4ad8b8 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-tmpfiles-don-t-resolve-pathnames-when-traversing-rec.patch @@ -0,0 +1,643 @@ +From 33dc9a280f952f503e5493ee29f6815bef29d551 Mon Sep 17 00:00:00 2001 +From: Franck Bui <fbui@suse.com> +Date: Fri, 2 Mar 2018 17:19:32 +0100 +Subject: [PATCH] tmpfiles: don't resolve pathnames when traversing recursively + through directory trees + +Otherwise we can be fooled if one path component is replaced underneath us. + +The patch achieves that by always operating at file descriptor level (by using +*at() helpers) and by making sure we do not any path resolution when traversing +direcotry trees. + +However this is not always possible, for instance when listing the content of a +directory or some operations don't provide the *at() helpers or others (such as +fchmodat()) don't have the AT_EMPTY_PATH flag. In such cases we operate on +/proc/self/fd/%i pseudo-symlink instead, which works the same for all kinds of +objects and requires no checking of type beforehand. + +Also O_PATH flag is used when opening file objects in order to prevent +undesired behaviors: device nodes from reacting, automounts from +triggering, etc... + +Fixes: CVE-2018-6954 + +Origin: upstream, https://github.com/systemd/systemd/commit/936f6bdb803c432578e2cdcc5f93f3bfff93aff0 +Bug: https://github.com/systemd/systemd/issues/7986 + +Patch from: +systemd_237-3ubuntu10.13.debian CVE-2018-6954.patch + +https://usn.ubuntu.com/3816-1/ states that CVE-2018-6954 doesn't +affect Ubuntu 18.10 which uses the same version of systemd as thud +(239). + +CVE: CVE-2018-6954 +Upstream-Status: Backport + +Signed-off-by: George McCollister <george.mccollister@gmail.com> +--- + src/tmpfiles/tmpfiles.c | 363 +++++++++++++++++++++++++++++++----------------- + 1 file changed, 239 insertions(+), 124 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 88cc543f09..613d418eb3 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -792,94 +792,105 @@ static bool hardlink_vulnerable(struct stat *st) { + return !S_ISDIR(st->st_mode) && st->st_nlink > 1 && dangerous_hardlinks(); + } + +-static int path_set_perms(Item *i, const char *path) { +- char fn[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; +- _cleanup_close_ int fd = -1; +- struct stat st; ++static int fd_set_perms(Item *i, int fd, const struct stat *st) { ++ _cleanup_free_ char *path = NULL; ++ int r; + + assert(i); +- assert(path); +- +- if (!i->mode_set && !i->uid_set && !i->gid_set) +- goto shortcut; +- +- /* We open the file with O_PATH here, to make the operation +- * somewhat atomic. Also there's unfortunately no fchmodat() +- * with AT_SYMLINK_NOFOLLOW, hence we emulate it here via +- * O_PATH. */ +- +- fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) { +- int level = LOG_ERR, r = -errno; ++ assert(fd); + +- /* Option "e" operates only on existing objects. Do not +- * print errors about non-existent files or directories */ +- if (i->type == EMPTY_DIRECTORY && errno == ENOENT) { +- level = LOG_DEBUG; +- r = 0; +- } +- +- log_full_errno(level, errno, "Adjusting owner and mode for %s failed: %m", path); ++ r = fd_get_path(fd, &path); ++ if (r < 0) + return r; +- } + +- if (fstatat(fd, "", &st, AT_EMPTY_PATH) < 0) +- return log_error_errno(errno, "Failed to fstat() file %s: %m", path); ++ if (!i->mode_set && !i->uid_set && !i->gid_set) ++ goto shortcut; + +- if (hardlink_vulnerable(&st)) { ++ if (hardlink_vulnerable(st)) { + log_error("Refusing to set permissions on hardlinked file %s while the fs.protected_hardlinks sysctl is turned off.", path); + return -EPERM; + } + +- xsprintf(fn, "/proc/self/fd/%i", fd); +- + if (i->mode_set) { +- if (S_ISLNK(st.st_mode)) ++ if (S_ISLNK(st->st_mode)) + log_debug("Skipping mode fix for symlink %s.", path); + else { + mode_t m = i->mode; + + if (i->mask_perms) { +- if (!(st.st_mode & 0111)) ++ if (!(st->st_mode & 0111)) + m &= ~0111; +- if (!(st.st_mode & 0222)) ++ if (!(st->st_mode & 0222)) + m &= ~0222; +- if (!(st.st_mode & 0444)) ++ if (!(st->st_mode & 0444)) + m &= ~0444; +- if (!S_ISDIR(st.st_mode)) ++ if (!S_ISDIR(st->st_mode)) + m &= ~07000; /* remove sticky/sgid/suid bit, unless directory */ + } + +- if (m == (st.st_mode & 07777)) +- log_debug("\"%s\" has correct mode %o already.", path, st.st_mode); ++ if (m == (st->st_mode & 07777)) ++ log_debug("\"%s\" has correct mode %o already.", path, st->st_mode); + else { ++ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ + log_debug("Changing \"%s\" to mode %o.", path, m); + +- if (chmod(fn, m) < 0) +- return log_error_errno(errno, "chmod() of %s via %s failed: %m", path, fn); ++ /* fchmodat() still doesn't have AT_EMPTY_PATH flag. */ ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); ++ ++ if (chmod(procfs_path, m) < 0) ++ return log_error_errno(errno, "chmod() of %s via %s failed: %m", path, procfs_path); + } + } + } + +- if ((i->uid_set && i->uid != st.st_uid) || +- (i->gid_set && i->gid != st.st_gid)) { ++ if ((i->uid_set && i->uid != st->st_uid) || ++ (i->gid_set && i->gid != st->st_gid)) { + log_debug("Changing \"%s\" to owner "UID_FMT":"GID_FMT, + path, + i->uid_set ? i->uid : UID_INVALID, + i->gid_set ? i->gid : GID_INVALID); + +- if (chown(fn, +- i->uid_set ? i->uid : UID_INVALID, +- i->gid_set ? i->gid : GID_INVALID) < 0) +- return log_error_errno(errno, "chown() of %s via %s failed: %m", path, fn); ++ if (fchownat(fd, ++ "", ++ i->uid_set ? i->uid : UID_INVALID, ++ i->gid_set ? i->gid : GID_INVALID, ++ AT_EMPTY_PATH) < 0) ++ return log_error_errno(errno, "fchownat() of %s failed: %m", path); + } + +- fd = safe_close(fd); +- + shortcut: + return label_fix(path, false, false); + } + ++static int path_set_perms(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1; ++ struct stat st; ++ ++ assert(i); ++ assert(path); ++ ++ fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) { ++ int level = LOG_ERR, r = -errno; ++ ++ /* Option "e" operates only on existing objects. Do not ++ * print errors about non-existent files or directories */ ++ if (i->type == EMPTY_DIRECTORY && errno == ENOENT) { ++ level = LOG_DEBUG; ++ r = 0; ++ } ++ ++ log_full_errno(level, errno, "Adjusting owner and mode for %s failed: %m", path); ++ return r; ++ } ++ ++ if (fstat(fd, &st) < 0) ++ return log_error_errno(errno, "Failed to fstat() file %s: %m", path); ++ ++ return fd_set_perms(i, fd, &st); ++} ++ + static int parse_xattrs_from_arg(Item *i) { + const char *p; + int r; +@@ -918,21 +929,43 @@ static int parse_xattrs_from_arg(Item *i) { + return 0; + } + +-static int path_set_xattrs(Item *i, const char *path) { ++static int fd_set_xattrs(Item *i, int fd, const struct stat *st) { ++ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ _cleanup_free_ char *path = NULL; + char **name, **value; ++ int r; + + assert(i); +- assert(path); ++ assert(fd); ++ ++ r = fd_get_path(fd, &path); ++ if (r < 0) ++ return r; ++ ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); + + STRV_FOREACH_PAIR(name, value, i->xattrs) { + log_debug("Setting extended attribute '%s=%s' on %s.", *name, *value, path); +- if (lsetxattr(path, *name, *value, strlen(*value), 0) < 0) ++ if (setxattr(procfs_path, *name, *value, strlen(*value), 0) < 0) + return log_error_errno(errno, "Setting extended attribute %s=%s on %s failed: %m", + *name, *value, path); + } + return 0; + } + ++static int path_set_xattrs(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1; ++ ++ assert(i); ++ assert(path); ++ ++ fd = open(path, O_CLOEXEC|O_NOFOLLOW|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Cannot open '%s': %m", path); ++ ++ return fd_set_xattrs(i, fd, NULL); ++} ++ + static int parse_acls_from_arg(Item *item) { + #if HAVE_ACL + int r; +@@ -998,52 +1031,71 @@ static int path_set_acl(const char *path, const char *pretty, acl_type_t type, a + } + #endif + +-static int path_set_acls(Item *item, const char *path) { ++static int fd_set_acls(Item *item, int fd, const struct stat *st) { + int r = 0; + #if HAVE_ACL +- char fn[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; +- _cleanup_close_ int fd = -1; +- struct stat st; ++ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ _cleanup_free_ char *path = NULL; + + assert(item); +- assert(path); +- +- fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) +- return log_error_errno(errno, "Adjusting ACL of %s failed: %m", path); ++ assert(fd); ++ assert(st); + +- if (fstatat(fd, "", &st, AT_EMPTY_PATH) < 0) +- return log_error_errno(errno, "Failed to fstat() file %s: %m", path); ++ r = fd_get_path(fd, &path); ++ if (r < 0) ++ return r; + +- if (hardlink_vulnerable(&st)) { ++ if (hardlink_vulnerable(st)) { + log_error("Refusing to set ACLs on hardlinked file %s while the fs.protected_hardlinks sysctl is turned off.", path); + return -EPERM; + } + +- if (S_ISLNK(st.st_mode)) { ++ if (S_ISLNK(st->st_mode)) { + log_debug("Skipping ACL fix for symlink %s.", path); + return 0; + } + +- xsprintf(fn, "/proc/self/fd/%i", fd); ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); + + if (item->acl_access) +- r = path_set_acl(fn, path, ACL_TYPE_ACCESS, item->acl_access, item->force); ++ r = path_set_acl(procfs_path, path, ACL_TYPE_ACCESS, item->acl_access, item->force); + + if (r == 0 && item->acl_default) +- r = path_set_acl(fn, path, ACL_TYPE_DEFAULT, item->acl_default, item->force); ++ r = path_set_acl(procfs_path, path, ACL_TYPE_DEFAULT, item->acl_default, item->force); + + if (r > 0) + return -r; /* already warned */ +- else if (r == -EOPNOTSUPP) { ++ if (r == -EOPNOTSUPP) { + log_debug_errno(r, "ACLs not supported by file system at %s", path); + return 0; +- } else if (r < 0) +- log_error_errno(r, "ACL operation on \"%s\" failed: %m", path); ++ } ++ if (r < 0) ++ return log_error_errno(r, "ACL operation on \"%s\" failed: %m", path); + #endif + return r; + } + ++static int path_set_acls(Item *item, const char *path) { ++ int r = 0; ++#ifdef HAVE_ACL ++ _cleanup_close_ int fd = -1; ++ struct stat st; ++ ++ assert(item); ++ assert(path); ++ ++ fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Adjusting ACL of %s failed: %m", path); ++ ++ if (fstat(fd, &st) < 0) ++ return log_error_errno(errno, "Failed to fstat() file %s: %m", path); ++ ++ r = fd_set_acls(item, fd, &st); ++ #endif ++ return r; ++ } ++ + #define ATTRIBUTES_ALL \ + (FS_NOATIME_FL | \ + FS_SYNC_FL | \ +@@ -1143,30 +1195,24 @@ static int parse_attribute_from_arg(Item *item) { + return 0; + } + +-static int path_set_attribute(Item *item, const char *path) { +- _cleanup_close_ int fd = -1; +- struct stat st; ++static int fd_set_attribute(Item *item, int fd, const struct stat *st) { ++ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ _cleanup_close_ int procfs_fd = -1; ++ _cleanup_free_ char *path = NULL; + unsigned f; + int r; + + if (!item->attribute_set || item->attribute_mask == 0) + return 0; + +- fd = open(path, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOATIME|O_NOFOLLOW); +- if (fd < 0) { +- if (errno == ELOOP) +- return log_error_errno(errno, "Skipping file attributes adjustment on symlink %s.", path); +- +- return log_error_errno(errno, "Cannot open '%s': %m", path); +- } +- +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Cannot stat '%s': %m", path); ++ r = fd_get_path(fd, &path); ++ if (r < 0) ++ return r; + + /* Issuing the file attribute ioctls on device nodes is not + * safe, as that will be delivered to the drivers, not the + * file system containing the device node. */ +- if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) { ++ if (!S_ISREG(st->st_mode) && !S_ISDIR(st->st_mode)) { + log_error("Setting file flags is only supported on regular files and directories, cannot set on '%s'.", path); + return -EINVAL; + } +@@ -1174,10 +1220,16 @@ static int path_set_attribute(Item *item, const char *path) { + f = item->attribute_value & item->attribute_mask; + + /* Mask away directory-specific flags */ +- if (!S_ISDIR(st.st_mode)) ++ if (!S_ISDIR(st->st_mode)) + f &= ~FS_DIRSYNC_FL; + +- r = chattr_fd(fd, f, item->attribute_mask); ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); ++ ++ procfs_fd = open(procfs_path, O_RDONLY|O_CLOEXEC|O_NOATIME); ++ if (procfs_fd < 0) ++ return -errno; ++ ++ r = chattr_fd(procfs_fd, f, item->attribute_mask); + if (r < 0) + log_full_errno(IN_SET(r, -ENOTTY, -EOPNOTSUPP) ? LOG_DEBUG : LOG_WARNING, + r, +@@ -1187,6 +1239,23 @@ static int path_set_attribute(Item *item, const char *path) { + return 0; + } + ++static int path_set_attribute(Item *item, const char *path) { ++ _cleanup_close_ int fd = -1; ++ struct stat st; ++ ++ if (!item->attribute_set || item->attribute_mask == 0) ++ return 0; ++ ++ fd = open(path, O_CLOEXEC|O_NOFOLLOW|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Cannot open '%s': %m", path); ++ ++ if (fstat(fd, &st) < 0) ++ return log_error_errno(errno, "Cannot stat '%s': %m", path); ++ ++ return fd_set_attribute(item, fd, &st); ++} ++ + static int write_one_file(Item *i, const char *path) { + _cleanup_close_ int fd = -1; + int flags, r = 0; +@@ -1251,48 +1320,58 @@ done: + } + + typedef int (*action_t)(Item *, const char *); ++typedef int (*fdaction_t)(Item *, int fd, const struct stat *st); + +-static int item_do_children(Item *i, const char *path, action_t action) { +- _cleanup_closedir_ DIR *d; +- struct dirent *de; +- int r = 0; ++static int item_do(Item *i, int fd, const struct stat *st, fdaction_t action) { ++ int r = 0, q; + + assert(i); +- assert(path); ++ assert(fd >= 0); ++ assert(st); + + /* This returns the first error we run into, but nevertheless + * tries to go on */ ++ r = action(i, fd, st); + +- d = opendir_nomod(path); +- if (!d) +- return IN_SET(errno, ENOENT, ENOTDIR, ELOOP) ? 0 : -errno; ++ if (S_ISDIR(st->st_mode)) { ++ char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ _cleanup_closedir_ DIR *d = NULL; ++ struct dirent *de; + +- FOREACH_DIRENT_ALL(de, d, r = -errno) { +- _cleanup_free_ char *p = NULL; +- int q; ++ /* The passed 'fd' was opened with O_PATH. We need to convert ++ * it into a 'regular' fd before reading the directory content. */ ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); + +- if (dot_or_dot_dot(de->d_name)) +- continue; ++ d = opendir(procfs_path); ++ if (!d) { ++ r = r ?: -errno; ++ goto finish; ++ } + +- p = strjoin(path, "/", de->d_name); +- if (!p) +- return -ENOMEM; ++ FOREACH_DIRENT_ALL(de, d, q = -errno; goto finish) { ++ struct stat de_st; ++ int de_fd; ++ ++ if (dot_or_dot_dot(de->d_name)) ++ continue; + +- q = action(i, p); +- if (q < 0 && q != -ENOENT && r == 0) +- r = q; ++ de_fd = openat(fd, de->d_name, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (de_fd >= 0 && fstat(de_fd, &de_st) >= 0) ++ /* pass ownership of dirent fd over */ ++ q = item_do(i, de_fd, &de_st, action); ++ else ++ q = -errno; + +- if (IN_SET(de->d_type, DT_UNKNOWN, DT_DIR)) { +- q = item_do_children(i, p, action); + if (q < 0 && r == 0) + r = q; + } + } +- ++finish: ++ safe_close(fd); + return r; + } + +-static int glob_item(Item *i, action_t action, bool recursive) { ++static int glob_item(Item *i, action_t action) { + _cleanup_globfree_ glob_t g = { + #ifdef GLOB_ALTDIRFUNC + .gl_opendir = (void *(*)(const char *)) opendir_nomod, +@@ -1309,12 +1388,48 @@ static int glob_item(Item *i, action_t action, bool recursive) { + k = action(i, *fn); + if (k < 0 && r == 0) + r = k; ++ } + +- if (recursive) { +- k = item_do_children(i, *fn, action); +- if (k < 0 && r == 0) +- r = k; ++ return r; ++} ++ ++static int glob_item_recursively(Item *i, fdaction_t action) { ++ _cleanup_globfree_ glob_t g = { ++ .gl_opendir = (void *(*)(const char *)) opendir_nomod, ++ }; ++ int r = 0, k; ++ char **fn; ++ ++ k = safe_glob(i->path, GLOB_NOSORT|GLOB_BRACE, &g); ++ if (k < 0 && k != -ENOENT) ++ return log_error_errno(k, "glob(%s) failed: %m", i->path); ++ ++ STRV_FOREACH(fn, g.gl_pathv) { ++ _cleanup_close_ int fd = -1; ++ struct stat st; ++ ++ /* Make sure we won't trigger/follow file object (such as ++ * device nodes, automounts, ...) pointed out by 'fn' with ++ * O_PATH. Note, when O_PATH is used, flags other than ++ * O_CLOEXEC, O_DIRECTORY, and O_NOFOLLOW are ignored. */ ++ ++ fd = open(*fn, O_CLOEXEC|O_NOFOLLOW|O_PATH); ++ if (fd < 0) { ++ r = r ?: -errno; ++ continue; ++ } ++ ++ if (fstat(fd, &st) < 0) { ++ r = r ?: -errno; ++ continue; + } ++ ++ k = item_do(i, fd, &st, action); ++ if (k < 0 && r == 0) ++ r = k; ++ ++ /* we passed fd ownership to the previous call */ ++ fd = -1; + } + + return r; +@@ -1403,7 +1518,7 @@ static int create_item(Item *i) { + break; + + case WRITE_FILE: +- r = glob_item(i, write_one_file, false); ++ r = glob_item(i, write_one_file); + if (r < 0) + return r; + +@@ -1662,49 +1777,49 @@ static int create_item(Item *i) { + + case ADJUST_MODE: + case RELABEL_PATH: +- r = glob_item(i, path_set_perms, false); ++ r = glob_item(i, path_set_perms); + if (r < 0) + return r; + break; + + case RECURSIVE_RELABEL_PATH: +- r = glob_item(i, path_set_perms, true); ++ r = glob_item_recursively(i, fd_set_perms); + if (r < 0) + return r; + break; + + case SET_XATTR: +- r = glob_item(i, path_set_xattrs, false); ++ r = glob_item(i, path_set_xattrs); + if (r < 0) + return r; + break; + + case RECURSIVE_SET_XATTR: +- r = glob_item(i, path_set_xattrs, true); ++ r = glob_item_recursively(i, fd_set_xattrs); + if (r < 0) + return r; + break; + + case SET_ACL: +- r = glob_item(i, path_set_acls, false); ++ r = glob_item(i, path_set_acls); + if (r < 0) + return r; + break; + + case RECURSIVE_SET_ACL: +- r = glob_item(i, path_set_acls, true); ++ r = glob_item_recursively(i, fd_set_acls); + if (r < 0) + return r; + break; + + case SET_ATTRIBUTE: +- r = glob_item(i, path_set_attribute, false); ++ r = glob_item(i, path_set_attribute); + if (r < 0) + return r; + break; + + case RECURSIVE_SET_ATTRIBUTE: +- r = glob_item(i, path_set_attribute, true); ++ r = glob_item_recursively(i, fd_set_attribute); + if (r < 0) + return r; + break; +@@ -1754,7 +1869,7 @@ static int remove_item(Item *i) { + case REMOVE_PATH: + case TRUNCATE_DIRECTORY: + case RECURSIVE_REMOVE_PATH: +- return glob_item(i, remove_item_instance, false); ++ return glob_item(i, remove_item_instance); + + default: + return 0; +@@ -1828,7 +1943,7 @@ static int clean_item(Item *i) { + return 0; + case EMPTY_DIRECTORY: + case IGNORE_DIRECTORY_PATH: +- return glob_item(i, clean_item_instance, false); ++ return glob_item(i, clean_item_instance); + default: + return 0; + } +-- +2.11.0 + diff --git a/meta/recipes-core/systemd/systemd/0002-Make-tmpfiles-safe.patch b/meta/recipes-core/systemd/systemd/0002-Make-tmpfiles-safe.patch new file mode 100644 index 0000000000..80d27c141b --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0002-Make-tmpfiles-safe.patch @@ -0,0 +1,1828 @@ +From fb95c890cf5116e698347c6a7bb3daeeb2d28cf9 Mon Sep 17 00:00:00 2001 +From: George McCollister <george.mccollister@gmail.com> +Date: Thu, 21 Feb 2019 18:04:37 -0600 +Subject: [PATCH] Make tmpfiles safe + +In addition to backporting the changesets in #8822, this also backports +e04fc13 (test: add tests for systemd-tmpfiles), as well as empty_to_root() +from v239. + +Origin: upstream, https://github.com/systemd/systemd/pull/8822/commits +Bug: https://github.com/systemd/systemd/issues/7986 + +Patch from: +systemd_237-3ubuntu10.13.debian CVE-2018-6954_2.patch + +https://usn.ubuntu.com/3816-1/ states that CVE-2018-6954 doesn't +affect Ubuntu 18.10 which uses the same version of systemd as thud +(239). + +CVE: CVE-2018-6954 +Upstream-Status: Backport + +Signed-off-by: George McCollister <george.mccollister@gmail.com> +--- + src/basic/btrfs-util.c | 26 +- + src/basic/btrfs-util.h | 1 + + src/basic/fileio.c | 5 +- + src/basic/fs-util.c | 27 +- + src/basic/fs-util.h | 2 + + src/basic/label.h | 1 + + src/basic/mkdir-label.c | 17 + + src/basic/mkdir.c | 6 + + src/basic/mkdir.h | 1 + + src/basic/path-util.c | 5 +- + src/basic/path-util.h | 4 + + src/basic/selinux-util.c | 84 +++-- + src/basic/selinux-util.h | 1 + + src/basic/smack-util.c | 119 +++++-- + src/basic/smack-util.h | 1 + + src/basic/stat-util.c | 11 + + src/basic/stat-util.h | 1 + + src/test/test-fs-util.c | 25 ++ + src/tmpfiles/tmpfiles.c | 902 ++++++++++++++++++++++++++++++++--------------- + 19 files changed, 882 insertions(+), 357 deletions(-) + +diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c +index 19d385ab7c..26b088f52b 100644 +--- a/src/basic/btrfs-util.c ++++ b/src/basic/btrfs-util.c +@@ -150,8 +150,25 @@ int btrfs_is_subvol(const char *path) { + return btrfs_is_subvol_fd(fd); + } + +-int btrfs_subvol_make(const char *path) { ++int btrfs_subvol_make_fd(int fd, const char *subvolume) { + struct btrfs_ioctl_vol_args args = {}; ++ int r; ++ ++ assert(subvolume); ++ ++ r = validate_subvolume_name(subvolume); ++ if (r < 0) ++ return r; ++ ++ strncpy(args.name, subvolume, sizeof(args.name)-1); ++ ++ if (ioctl(fd, BTRFS_IOC_SUBVOL_CREATE, &args) < 0) ++ return -errno; ++ ++ return 0; ++} ++ ++int btrfs_subvol_make(const char *path) { + _cleanup_close_ int fd = -1; + const char *subvolume; + int r; +@@ -166,12 +183,7 @@ int btrfs_subvol_make(const char *path) { + if (fd < 0) + return fd; + +- strncpy(args.name, subvolume, sizeof(args.name)-1); +- +- if (ioctl(fd, BTRFS_IOC_SUBVOL_CREATE, &args) < 0) +- return -errno; +- +- return 0; ++ return btrfs_subvol_make_fd(fd, subvolume); + } + + int btrfs_subvol_set_read_only_fd(int fd, bool b) { +diff --git a/src/basic/btrfs-util.h b/src/basic/btrfs-util.h +index 952b3c26da..e92687bc57 100644 +--- a/src/basic/btrfs-util.h ++++ b/src/basic/btrfs-util.h +@@ -84,6 +84,7 @@ int btrfs_resize_loopback_fd(int fd, uint64_t size, bool grow_only); + int btrfs_resize_loopback(const char *path, uint64_t size, bool grow_only); + + int btrfs_subvol_make(const char *path); ++int btrfs_subvol_make_fd(int fd, const char *subvolume); + + int btrfs_subvol_snapshot_fd(int old_fd, const char *new_path, BtrfsSnapshotFlags flags); + int btrfs_subvol_snapshot(const char *old_path, const char *new_path, BtrfsSnapshotFlags flags); +diff --git a/src/basic/fileio.c b/src/basic/fileio.c +index 26d6174664..1c7e23332f 100644 +--- a/src/basic/fileio.c ++++ b/src/basic/fileio.c +@@ -1304,7 +1304,10 @@ int tempfn_random_child(const char *p, const char *extra, char **ret) { + if (!t) + return -ENOMEM; + +- x = stpcpy(stpcpy(stpcpy(t, p), "/.#"), extra); ++ if (isempty(p)) ++ x = stpcpy(stpcpy(t, ".#"), extra); ++ else ++ x = stpcpy(stpcpy(stpcpy(t, p), "/.#"), extra); + + u = random_u64(); + for (i = 0; i < 16; i++) { +diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c +index a8e50d4c78..c96a8813ea 100644 +--- a/src/basic/fs-util.c ++++ b/src/basic/fs-util.c +@@ -465,6 +465,31 @@ int mkfifo_atomic(const char *path, mode_t mode) { + return 0; + } + ++int mkfifoat_atomic(int dirfd, const char *path, mode_t mode) { ++ _cleanup_free_ char *t = NULL; ++ int r; ++ ++ assert(path); ++ ++ if (path_is_absolute(path)) ++ return mkfifo_atomic(path, mode); ++ ++ /* We're only interested in the (random) filename. */ ++ r = tempfn_random_child("", NULL, &t); ++ if (r < 0) ++ return r; ++ ++ if (mkfifoat(dirfd, t, mode) < 0) ++ return -errno; ++ ++ if (renameat(dirfd, t, dirfd, path) < 0) { ++ unlink_noerrno(t); ++ return -errno; ++ } ++ ++ return 0; ++} ++ + int get_files_in_directory(const char *path, char ***list) { + _cleanup_closedir_ DIR *d = NULL; + struct dirent *de; +@@ -808,7 +833,7 @@ int chase_symlinks(const char *path, const char *original_root, unsigned flags, + fd_is_fs_type(child, AUTOFS_SUPER_MAGIC) > 0) + return -EREMOTE; + +- if (S_ISLNK(st.st_mode)) { ++ if (S_ISLNK(st.st_mode) && !((flags & CHASE_NOFOLLOW) && isempty(todo))) { + char *joined; + + _cleanup_free_ char *destination = NULL; +diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h +index 9c4b02eccd..121345e74d 100644 +--- a/src/basic/fs-util.h ++++ b/src/basic/fs-util.h +@@ -80,6 +80,7 @@ int symlink_idempotent(const char *from, const char *to); + int symlink_atomic(const char *from, const char *to); + int mknod_atomic(const char *path, mode_t mode, dev_t dev); + int mkfifo_atomic(const char *path, mode_t mode); ++int mkfifoat_atomic(int dir_fd, const char *path, mode_t mode); + + int get_files_in_directory(const char *path, char ***list); + +@@ -106,6 +107,7 @@ enum { + CHASE_NO_AUTOFS = 1U << 2, /* If set, return -EREMOTE if autofs mount point found */ + CHASE_SAFE = 1U << 3, /* If set, return EPERM if we ever traverse from unprivileged to privileged files or directories */ + CHASE_OPEN = 1U << 4, /* If set, return an O_PATH object to the final component */ ++ CHASE_NOFOLLOW = 1U << 7, /* Only valid with CHASE_OPEN: when the path's right-most component refers to symlink return O_PATH fd of the symlink, rather than following it. */ + }; + + int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret); +diff --git a/src/basic/label.h b/src/basic/label.h +index d73dacec4f..3ecfed72c6 100644 +--- a/src/basic/label.h ++++ b/src/basic/label.h +@@ -26,6 +26,7 @@ + int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs); + + int mkdir_label(const char *path, mode_t mode); ++int mkdirat_label(int dirfd, const char *path, mode_t mode); + int symlink_label(const char *old_path, const char *new_path); + + int btrfs_subvol_make_label(const char *path); +diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c +index 6f3a46f467..3c1a227bfa 100644 +--- a/src/basic/mkdir-label.c ++++ b/src/basic/mkdir-label.c +@@ -47,6 +47,23 @@ int mkdir_label(const char *path, mode_t mode) { + return mac_smack_fix(path, false, false); + } + ++int mkdirat_label(int dirfd, const char *path, mode_t mode) { ++ int r; ++ ++ assert(path); ++ ++ r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR); ++ if (r < 0) ++ return r; ++ ++ r = mkdirat_errno_wrapper(dirfd, path, mode); ++ mac_selinux_create_file_clear(); ++ if (r < 0) ++ return r; ++ ++ return mac_smack_fix_at(dirfd, path, false, false); ++} ++ + int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink) { + return mkdir_safe_internal(path, mode, uid, gid, follow_symlink, mkdir_label); + } +diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c +index d51518a5a7..418945ad4a 100644 +--- a/src/basic/mkdir.c ++++ b/src/basic/mkdir.c +@@ -77,6 +77,12 @@ int mkdir_errno_wrapper(const char *pathname, mode_t mode) { + return 0; + } + ++int mkdirat_errno_wrapper(int dirfd, const char *pathname, mode_t mode) { ++ if (mkdirat(dirfd, pathname, mode) < 0) ++ return -errno; ++ return 0; ++} ++ + int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink) { + return mkdir_safe_internal(path, mode, uid, gid, follow_symlink, mkdir_errno_wrapper); + } +diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h +index d6c2d579a3..3ec6f3ed2d 100644 +--- a/src/basic/mkdir.h ++++ b/src/basic/mkdir.h +@@ -24,6 +24,7 @@ + #include <sys/types.h> + + int mkdir_errno_wrapper(const char *pathname, mode_t mode); ++int mkdirat_errno_wrapper(int dirfd, const char *pathname, mode_t mode); + int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid, bool follow_symlink); + int mkdir_parents(const char *path, mode_t mode); + int mkdir_p(const char *path, mode_t mode); +diff --git a/src/basic/path-util.c b/src/basic/path-util.c +index df94629385..84404f7ee1 100644 +--- a/src/basic/path-util.c ++++ b/src/basic/path-util.c +@@ -127,10 +127,7 @@ int path_make_absolute_cwd(const char *p, char **ret) { + if (r < 0) + return r; + +- if (endswith(cwd, "/")) +- c = strjoin(cwd, p); +- else +- c = strjoin(cwd, "/", p); ++ c = path_join(NULL, cwd, p); + } + if (!c) + return -ENOMEM; +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 89c285e076..1094baca12 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -156,3 +156,7 @@ static inline const char *skip_dev_prefix(const char *p) { + + return e ?: p; + } ++static inline const char *empty_to_root(const char *path) { ++ return isempty(path) ? "/" : path; ++} ++ +diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c +index 0c6e99b1d7..bdef7d148b 100644 +--- a/src/basic/selinux-util.c ++++ b/src/basic/selinux-util.c +@@ -34,6 +34,7 @@ + #endif + + #include "alloc-util.h" ++#include "fd-util.h" + #include "log.h" + #include "macro.h" + #include "path-util.h" +@@ -311,48 +312,89 @@ char* mac_selinux_free(char *label) { + return NULL; + } + +-int mac_selinux_create_file_prepare(const char *path, mode_t mode) { +- + #if HAVE_SELINUX ++static int selinux_create_file_prepare_abspath(const char *abspath, mode_t mode) { + _cleanup_freecon_ char *filecon = NULL; ++ _cleanup_free_ char *path = NULL; + int r; + +- assert(path); +- +- if (!label_hnd) +- return 0; +- +- if (path_is_absolute(path)) +- r = selabel_lookup_raw(label_hnd, &filecon, path, mode); +- else { +- _cleanup_free_ char *newpath = NULL; +- +- r = path_make_absolute_cwd(path, &newpath); +- if (r < 0) +- return r; +- +- r = selabel_lookup_raw(label_hnd, &filecon, newpath, mode); +- } ++ assert(abspath); ++ assert(path_is_absolute(abspath)); + ++ r = selabel_lookup_raw(label_hnd, &filecon, abspath, mode); + if (r < 0) { + /* No context specified by the policy? Proceed without setting it. */ + if (errno == ENOENT) + return 0; + +- log_enforcing("Failed to determine SELinux security context for %s: %m", path); ++ log_enforcing("Failed to determine SELinux security context for %s: %m", abspath); + } else { + if (setfscreatecon_raw(filecon) >= 0) + return 0; /* Success! */ + +- log_enforcing("Failed to set SELinux security context %s for %s: %m", filecon, path); ++ log_enforcing("Failed to set SELinux security context %s for %s: %m", filecon, abspath); + } + + if (security_getenforce() > 0) + return -errno; + +-#endif + return 0; + } ++#endif ++ ++int mac_selinux_create_file_prepare_at(int dirfd, const char *path, mode_t mode) { ++ int r = 0; ++ ++#if HAVE_SELINUX ++ _cleanup_free_ char *abspath = NULL; ++ _cleanup_close_ int fd = -1; ++ ++ assert(path); ++ ++ if (!label_hnd) ++ return 0; ++ ++ if (!path_is_absolute(path)) { ++ _cleanup_free_ char *p = NULL; ++ ++ if (dirfd == AT_FDCWD) ++ r = safe_getcwd(&p); ++ else ++ r = fd_get_path(dirfd, &p); ++ if (r < 0) ++ return r; ++ ++ abspath = path_join(NULL, p, path); ++ if (!abspath) ++ return -ENOMEM; ++ ++ path = abspath; ++ } ++ ++ r = selinux_create_file_prepare_abspath(path, mode); ++#endif ++ return r; ++} ++ ++int mac_selinux_create_file_prepare(const char *path, mode_t mode) { ++ int r = 0; ++ ++#if HAVE_SELINUX ++ _cleanup_free_ char *abspath = NULL; ++ ++ assert(path); ++ ++ if (!label_hnd) ++ return 0; ++ ++ r = path_make_absolute_cwd(path, &abspath); ++ if (r < 0) ++ return r; ++ ++ r = selinux_create_file_prepare_abspath(abspath, mode); ++#endif ++ return r; ++} + + void mac_selinux_create_file_clear(void) { + +diff --git a/src/basic/selinux-util.h b/src/basic/selinux-util.h +index 9780dca81e..84a8bf9729 100644 +--- a/src/basic/selinux-util.h ++++ b/src/basic/selinux-util.h +@@ -41,6 +41,7 @@ int mac_selinux_get_child_mls_label(int socket_fd, const char *exe, const char * + char* mac_selinux_free(char *label); + + int mac_selinux_create_file_prepare(const char *path, mode_t mode); ++int mac_selinux_create_file_prepare_at(int dirfd, const char *path, mode_t mode); + void mac_selinux_create_file_clear(void); + + int mac_selinux_create_socket_prepare(const char *label); +diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c +index f0018f013f..ea0af3e45f 100644 +--- a/src/basic/smack-util.c ++++ b/src/basic/smack-util.c +@@ -21,18 +21,21 @@ + ***/ + + #include <errno.h> ++#include <fcntl.h> + #include <string.h> + #include <sys/stat.h> + #include <sys/xattr.h> + #include <unistd.h> + + #include "alloc-util.h" ++#include "fd-util.h" + #include "fileio.h" + #include "log.h" + #include "macro.h" + #include "path-util.h" + #include "process-util.h" + #include "smack-util.h" ++#include "stdio-util.h" + #include "string-table.h" + #include "xattr-util.h" + +@@ -134,59 +137,111 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { + return r; + } + +-int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { ++static int smack_fix_fd(int fd , const char *abspath, bool ignore_erofs) { ++ char procfs_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; ++ const char *label; + struct stat st; + int r; + +- assert(path); ++ /* The caller should have done the sanity checks. */ ++ assert(abspath); ++ assert(path_is_absolute(abspath)); + +- if (!mac_smack_use()) ++ /* Path must be in /dev. */ ++ if (!path_startswith(abspath, "/dev")) + return 0; + ++ if (fstat(fd, &st) < 0) ++ return -errno; ++ + /* +- * Path must be in /dev and must exist ++ * Label directories and character devices "*". ++ * Label symlinks "_". ++ * Don't change anything else. + */ +- if (!path_startswith(path, "/dev")) ++ ++ if (S_ISDIR(st.st_mode)) ++ label = SMACK_STAR_LABEL; ++ else if (S_ISLNK(st.st_mode)) ++ label = SMACK_FLOOR_LABEL; ++ else if (S_ISCHR(st.st_mode)) ++ label = SMACK_STAR_LABEL; ++ else + return 0; + +- r = lstat(path, &st); +- if (r >= 0) { +- const char *label; +- +- /* +- * Label directories and character devices "*". +- * Label symlinks "_". +- * Don't change anything else. +- */ +- +- if (S_ISDIR(st.st_mode)) +- label = SMACK_STAR_LABEL; +- else if (S_ISLNK(st.st_mode)) +- label = SMACK_FLOOR_LABEL; +- else if (S_ISCHR(st.st_mode)) +- label = SMACK_STAR_LABEL; +- else +- return 0; ++ xsprintf(procfs_path, "/proc/self/fd/%i", fd); ++ if (setxattr(procfs_path, "security.SMACK64", label, strlen(label), 0) < 0) { ++ _cleanup_free_ char *old_label = NULL; + +- r = lsetxattr(path, "security.SMACK64", label, strlen(label), 0); ++ r = -errno; + + /* If the FS doesn't support labels, then exit without warning */ +- if (r < 0 && errno == EOPNOTSUPP) ++ if (r == -EOPNOTSUPP) ++ return 0; ++ ++ /* It the FS is read-only and we were told to ignore failures caused by that, suppress error */ ++ if (r == -EROFS && ignore_erofs) ++ return 0; ++ ++ /* If the old label is identical to the new one, suppress any kind of error */ ++ if (getxattr_malloc(procfs_path, "security.SMACK64", &old_label, false) >= 0 && ++ streq(old_label, label)) + return 0; ++ ++ return log_debug_errno(r, "Unable to fix SMACK label of %s: %m", abspath); + } + +- if (r < 0) { +- /* Ignore ENOENT in some cases */ ++ return r; ++} ++ ++int mac_smack_fix_at(int dirfd, const char *path, bool ignore_enoent, bool ignore_erofs) { ++ _cleanup_free_ char *p = NULL; ++ _cleanup_close_ int fd = -1; ++ int r; ++ ++ assert(path); ++ ++ if (!mac_smack_use()) ++ return 0; ++ ++ fd = openat(dirfd, path, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) { + if (ignore_enoent && errno == ENOENT) + return 0; + +- if (ignore_erofs && errno == EROFS) ++ return -errno; ++ } ++ ++ r = fd_get_path(fd, &p); ++ if (r < 0) ++ return r; ++ ++ return smack_fix_fd(fd, p, ignore_erofs); ++} ++ ++int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { ++ _cleanup_free_ char *abspath = NULL; ++ _cleanup_close_ int fd = -1; ++ int r; ++ ++ assert(path); ++ ++ if (!mac_smack_use()) ++ return 0; ++ ++ r = path_make_absolute_cwd(path, &abspath); ++ if (r < 0) ++ return r; ++ ++ fd = open(abspath, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) { ++ if (ignore_enoent && errno == ENOENT) + return 0; + +- r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path); ++ return -errno; + } + +- return r; ++ return smack_fix_fd(fd, abspath, ignore_erofs); + } + + int mac_smack_copy(const char *dest, const char *src) { +@@ -236,6 +291,10 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) { + return 0; + } + ++int mac_smack_fix_at(int dirfd, const char *path, bool ignore_enoent, bool ignore_erofs) { ++ return 0; ++} ++ + int mac_smack_copy(const char *dest, const char *src) { + return 0; + } +diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h +index e4d46d7736..0c214bbbc0 100644 +--- a/src/basic/smack-util.h ++++ b/src/basic/smack-util.h +@@ -44,6 +44,7 @@ typedef enum SmackAttr { + bool mac_smack_use(void); + + int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs); ++int mac_smack_fix_at(int dirfd, const char *path, bool ignore_enoent, bool ignore_erofs); + + const char* smack_attr_to_string(SmackAttr i) _const_; + SmackAttr smack_attr_from_string(const char *s) _pure_; +diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c +index 3a54103f1b..801889ae5b 100644 +--- a/src/basic/stat-util.c ++++ b/src/basic/stat-util.c +@@ -63,6 +63,17 @@ int is_dir(const char* path, bool follow) { + return !!S_ISDIR(st.st_mode); + } + ++int is_dir_fd(int fd) { ++ struct stat st; ++ int r; ++ ++ r = fstat(fd, &st); ++ if (r < 0) ++ return -errno; ++ ++ return !!S_ISDIR(st.st_mode); ++} ++ + int is_device_node(const char *path) { + struct stat info; + +diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h +index d8d3c20496..7ea68abfa3 100644 +--- a/src/basic/stat-util.h ++++ b/src/basic/stat-util.h +@@ -31,6 +31,7 @@ + + int is_symlink(const char *path); + int is_dir(const char *path, bool follow); ++int is_dir_fd(int fd); + int is_device_node(const char *path); + + int dir_is_empty(const char *path); +diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c +index 9f3a500080..a76d6d0f8b 100644 +--- a/src/test/test-fs-util.c ++++ b/src/test/test-fs-util.c +@@ -40,6 +40,7 @@ static void test_chase_symlinks(void) { + _cleanup_free_ char *result = NULL; + char temp[] = "/tmp/test-chase.XXXXXX"; + const char *top, *p, *pslash, *q, *qslash; ++ struct stat st; + int r, pfd; + + assert_se(mkdtemp(temp)); +@@ -288,6 +289,30 @@ static void test_chase_symlinks(void) { + assert_se(sd_id128_equal(a, b)); + } + ++ /* Test CHASE_NOFOLLOW */ ++ ++ p = strjoina(temp, "/target"); ++ q = strjoina(temp, "/symlink"); ++ assert_se(symlink(p, q) >= 0); ++ pfd = chase_symlinks(q, NULL, CHASE_OPEN|CHASE_NOFOLLOW, &result); ++ assert_se(pfd > 0); ++ assert_se(path_equal(result, q)); ++ assert_se(fstat(pfd, &st) >= 0); ++ assert_se(S_ISLNK(st.st_mode)); ++ result = mfree(result); ++ ++ /* s1 -> s2 -> nonexistent */ ++ q = strjoina(temp, "/s1"); ++ assert_se(symlink("s2", q) >= 0); ++ p = strjoina(temp, "/s2"); ++ assert_se(symlink("nonexistent", p) >= 0); ++ pfd = chase_symlinks(q, NULL, CHASE_OPEN|CHASE_NOFOLLOW, &result); ++ assert_se(pfd > 0); ++ assert_se(path_equal(result, q)); ++ assert_se(fstat(pfd, &st) >= 0); ++ assert_se(S_ISLNK(st.st_mode)); ++ result = mfree(result); ++ + assert_se(rm_rf(temp, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0); + } + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 613d418eb3..d59ccbaa39 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -794,6 +794,7 @@ static bool hardlink_vulnerable(struct stat *st) { + + static int fd_set_perms(Item *i, int fd, const struct stat *st) { + _cleanup_free_ char *path = NULL; ++ struct stat stbuf; + int r; + + assert(i); +@@ -806,6 +807,12 @@ static int fd_set_perms(Item *i, int fd, const struct stat *st) { + if (!i->mode_set && !i->uid_set && !i->gid_set) + goto shortcut; + ++ if (!st) { ++ if (fstat(fd, &stbuf) < 0) ++ return log_error_errno(errno, "fstat(%s) failed: %m", path); ++ st = &stbuf; ++ } ++ + if (hardlink_vulnerable(st)) { + log_error("Refusing to set permissions on hardlinked file %s while the fs.protected_hardlinks sysctl is turned off.", path); + return -EPERM; +@@ -863,32 +870,62 @@ shortcut: + return label_fix(path, false, false); + } + +-static int path_set_perms(Item *i, const char *path) { +- _cleanup_close_ int fd = -1; +- struct stat st; ++static int path_open_parent_safe(const char *path) { ++ _cleanup_free_ char *dn = NULL; ++ int fd; + +- assert(i); +- assert(path); ++ if (path_equal(path, "/") || !path_is_normalized(path)) { ++ log_error("Failed to open parent of '%s': invalid path.", path); ++ return -EINVAL; ++ } + +- fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) { +- int level = LOG_ERR, r = -errno; ++ dn = dirname_malloc(path); ++ if (!dn) ++ return log_oom(); + +- /* Option "e" operates only on existing objects. Do not +- * print errors about non-existent files or directories */ +- if (i->type == EMPTY_DIRECTORY && errno == ENOENT) { +- level = LOG_DEBUG; +- r = 0; +- } ++ fd = chase_symlinks(dn, NULL, CHASE_OPEN|CHASE_SAFE, NULL); ++ if (fd == -EPERM) ++ return log_error_errno(fd, "Unsafe symlinks encountered in %s, refusing.", path); ++ if (fd < 0) ++ return log_error_errno(fd, "Failed to validate path %s: %m", path); + +- log_full_errno(level, errno, "Adjusting owner and mode for %s failed: %m", path); +- return r; ++ return fd; ++} ++ ++static int path_open_safe(const char *path) { ++ int fd; ++ ++ /* path_open_safe() returns a file descriptor opened with O_PATH after ++ * verifying that the path doesn't contain unsafe transitions, except ++ * for its final component as the function does not follow symlink. */ ++ ++ assert(path); ++ ++ if (!path_is_normalized(path)) { ++ log_error("Failed to open invalid path '%s'.", path); ++ return -EINVAL; + } + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat() file %s: %m", path); ++ fd = chase_symlinks(path, NULL, CHASE_OPEN|CHASE_SAFE|CHASE_NOFOLLOW, NULL); ++ if (fd == -EPERM) ++ return log_error_errno(fd, "Unsafe symlinks encountered in %s, refusing.", path); ++ if (fd < 0) ++ return log_error_errno(fd, "Failed to validate path %s: %m", path); ++ ++ return fd; ++} ++ ++static int path_set_perms(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1; ++ ++ assert(i); ++ assert(path); + +- return fd_set_perms(i, fd, &st); ++ fd = path_open_safe(path); ++ if (fd < 0) ++ return fd; ++ ++ return fd_set_perms(i, fd, NULL); + } + + static int parse_xattrs_from_arg(Item *i) { +@@ -959,9 +996,9 @@ static int path_set_xattrs(Item *i, const char *path) { + assert(i); + assert(path); + +- fd = open(path, O_CLOEXEC|O_NOFOLLOW|O_PATH); ++ fd = path_open_safe(path); + if (fd < 0) +- return log_error_errno(errno, "Cannot open '%s': %m", path); ++ return fd; + + return fd_set_xattrs(i, fd, NULL); + } +@@ -1036,15 +1073,21 @@ static int fd_set_acls(Item *item, int fd, const struct stat *st) { + #if HAVE_ACL + char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; + _cleanup_free_ char *path = NULL; ++ struct stat stbuf; + + assert(item); + assert(fd); +- assert(st); + + r = fd_get_path(fd, &path); + if (r < 0) + return r; + ++ if (!st) { ++ if (fstat(fd, &stbuf) < 0) ++ return log_error_errno(errno, "fstat(%s) failed: %m", path); ++ st = &stbuf; ++ } ++ + if (hardlink_vulnerable(st)) { + log_error("Refusing to set ACLs on hardlinked file %s while the fs.protected_hardlinks sysctl is turned off.", path); + return -EPERM; +@@ -1079,19 +1122,15 @@ static int path_set_acls(Item *item, const char *path) { + int r = 0; + #ifdef HAVE_ACL + _cleanup_close_ int fd = -1; +- struct stat st; + + assert(item); + assert(path); + +- fd = open(path, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ fd = path_open_safe(path); + if (fd < 0) +- return log_error_errno(errno, "Adjusting ACL of %s failed: %m", path); ++ return fd; + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat() file %s: %m", path); +- +- r = fd_set_acls(item, fd, &st); ++ r = fd_set_acls(item, fd, NULL); + #endif + return r; + } +@@ -1199,6 +1238,7 @@ static int fd_set_attribute(Item *item, int fd, const struct stat *st) { + char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; + _cleanup_close_ int procfs_fd = -1; + _cleanup_free_ char *path = NULL; ++ struct stat stbuf; + unsigned f; + int r; + +@@ -1209,6 +1249,12 @@ static int fd_set_attribute(Item *item, int fd, const struct stat *st) { + if (r < 0) + return r; + ++ if (!st) { ++ if (fstat(fd, &stbuf) < 0) ++ return log_error_errno(errno, "fstat(%s) failed: %m", path); ++ st = &stbuf; ++ } ++ + /* Issuing the file attribute ioctls on device nodes is not + * safe, as that will be delivered to the drivers, not the + * file system containing the device node. */ +@@ -1241,99 +1287,558 @@ static int fd_set_attribute(Item *item, int fd, const struct stat *st) { + + static int path_set_attribute(Item *item, const char *path) { + _cleanup_close_ int fd = -1; +- struct stat st; + + if (!item->attribute_set || item->attribute_mask == 0) + return 0; + +- fd = open(path, O_CLOEXEC|O_NOFOLLOW|O_PATH); ++ fd = path_open_safe(path); + if (fd < 0) +- return log_error_errno(errno, "Cannot open '%s': %m", path); +- +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Cannot stat '%s': %m", path); ++ return fd; + +- return fd_set_attribute(item, fd, &st); ++ return fd_set_attribute(item, fd, NULL); + } + + static int write_one_file(Item *i, const char *path) { +- _cleanup_close_ int fd = -1; +- int flags, r = 0; +- struct stat st; ++ _cleanup_close_ int fd = -1, dir_fd = -1; ++ char *bn; ++ int r; ++ ++ assert(i); ++ assert(path); ++ assert(i->argument); ++ assert(i->type == WRITE_FILE); ++ ++ /* Validate the path and keep the fd on the directory for opening the ++ * file so we're sure that it can't be changed behind our back. */ ++ dir_fd = path_open_parent_safe(path); ++ if (dir_fd < 0) ++ return dir_fd; ++ ++ bn = basename(path); ++ ++ /* Follows symlinks */ ++ fd = openat(dir_fd, bn, O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode); ++ if (fd < 0) { ++ if (errno == ENOENT) { ++ log_debug_errno(errno, "Not writing missing file \"%s\": %m", path); ++ return 0; ++ } ++ return log_error_errno(errno, "Failed to open file \"%s\": %m", path); ++ } ++ ++ /* 'w' is allowed to write into any kind of files. */ ++ log_debug("Writing to \"%s\".", path); ++ ++ r = loop_write(fd, i->argument, strlen(i->argument), false); ++ if (r < 0) ++ return log_error_errno(r, "Failed to write file \"%s\": %m", path); ++ ++ return fd_set_perms(i, fd, NULL); ++} ++ ++static int create_file(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1, dir_fd = -1; ++ struct stat stbuf, *st = NULL; ++ int r = 0; ++ char *bn; + + assert(i); + assert(path); ++ assert(i->type == CREATE_FILE); ++ ++ /* 'f' operates on regular files exclusively. */ + +- flags = i->type == CREATE_FILE ? O_CREAT|O_EXCL|O_NOFOLLOW : +- i->type == TRUNCATE_FILE ? O_CREAT|O_TRUNC|O_NOFOLLOW : 0; ++ /* Validate the path and keep the fd on the directory for opening the ++ * file so we're sure that it can't be changed behind our back. */ ++ dir_fd = path_open_parent_safe(path); ++ if (dir_fd < 0) ++ return dir_fd; ++ ++ bn = basename(path); + + RUN_WITH_UMASK(0000) { + mac_selinux_create_file_prepare(path, S_IFREG); +- fd = open(path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode); ++ fd = openat(dir_fd, bn, O_CREAT|O_EXCL|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode); + mac_selinux_create_file_clear(); + } + + if (fd < 0) { +- if (i->type == WRITE_FILE && errno == ENOENT) { +- log_debug_errno(errno, "Not writing missing file \"%s\": %m", path); +- return 0; ++ /* Even on a read-only filesystem, open(2) returns EEXIST if the ++ * file already exists. It returns EROFS only if it needs to ++ * create the file. */ ++ if (errno != EEXIST) ++ return log_error_errno(errno, "Failed to create file %s: %m", path); ++ ++ /* Re-open the file. At that point it must exist since open(2) ++ * failed with EEXIST. We still need to check if the perms/mode ++ * need to be changed. For read-only filesystems, we let ++ * fd_set_perms() report the error if the perms need to be ++ * modified. */ ++ fd = openat(dir_fd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH, i->mode); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to re-open file %s: %m", path); ++ ++ if (fstat(fd, &stbuf) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", path); ++ ++ if (!S_ISREG(stbuf.st_mode)) { ++ log_error("%s exists and is not a regular file.", path); ++ return -EEXIST; + } +- if (i->type == CREATE_FILE && errno == EEXIST) { +- log_debug_errno(errno, "Not writing to pre-existing file \"%s\": %m", path); +- goto done; ++ ++ st = &stbuf; ++ } else { ++ ++ log_debug("\"%s\" has been created.", path); ++ ++ if (i->argument) { ++ log_debug("Writing to \"%s\".", path); ++ ++ r = loop_write(fd, i->argument, strlen(i->argument), false); ++ if (r < 0) ++ return log_error_errno(r, "Failed to write file \"%s\": %m", path); + } ++ } + +- r = -errno; +- if (!i->argument && errno == EROFS && stat(path, &st) == 0 && +- (i->type == CREATE_FILE || st.st_size == 0)) +- goto check_mode; ++ return fd_set_perms(i, fd, st); ++} + +- return log_error_errno(r, "Failed to create file %s: %m", path); ++static int truncate_file(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1, dir_fd = -1; ++ struct stat stbuf, *st = NULL; ++ bool erofs = false; ++ int r = 0; ++ char *bn; ++ ++ assert(i); ++ assert(path); ++ assert(i->type == TRUNCATE_FILE); ++ ++ /* We want to operate on regular file exclusively especially since ++ * O_TRUNC is unspecified if the file is neither a regular file nor a ++ * fifo nor a terminal device. Therefore we first open the file and make ++ * sure it's a regular one before truncating it. */ ++ ++ /* Validate the path and keep the fd on the directory for opening the ++ * file so we're sure that it can't be changed behind our back. */ ++ dir_fd = path_open_parent_safe(path); ++ if (dir_fd < 0) ++ return dir_fd; ++ ++ bn = basename(path); ++ ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(path, S_IFREG); ++ fd = openat(dir_fd, bn, O_CREAT|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode); ++ mac_selinux_create_file_clear(); + } + +- if (i->argument) { +- log_debug("%s to \"%s\".", i->type == CREATE_FILE ? "Appending" : "Writing", path); ++ if (fd < 0) { ++ if (errno != EROFS) ++ return log_error_errno(errno, "Failed to open/create file %s: %m", path); + +- r = loop_write(fd, i->argument, strlen(i->argument), false); +- if (r < 0) +- return log_error_errno(r, "Failed to write file \"%s\": %m", path); +- } else +- log_debug("\"%s\" has been created.", path); ++ /* On a read-only filesystem, we don't want to fail if the ++ * target is already empty and the perms are set. So we still ++ * proceed with the sanity checks and let the remaining ++ * operations fail with EROFS if they try to modify the target ++ * file. */ ++ ++ fd = openat(dir_fd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH, i->mode); ++ if (fd < 0) { ++ if (errno == ENOENT) { ++ log_error("Cannot create file %s on a read-only file system.", path); ++ return -EROFS; ++ } + +- fd = safe_close(fd); ++ return log_error_errno(errno, "Failed to re-open file %s: %m", path); ++ } + +-done: +- if (stat(path, &st) < 0) ++ erofs = true; ++ } ++ ++ if (fstat(fd, &stbuf) < 0) + return log_error_errno(errno, "stat(%s) failed: %m", path); + +- check_mode: +- if (!S_ISREG(st.st_mode)) { +- log_error("%s is not a file.", path); ++ if (!S_ISREG(stbuf.st_mode)) { ++ log_error("%s exists and is not a regular file.", path); + return -EEXIST; + } + +- r = path_set_perms(i, path); ++ if (stbuf.st_size > 0) { ++ if (ftruncate(fd, 0) < 0) { ++ r = erofs ? -EROFS : -errno; ++ return log_error_errno(r, "Failed to truncate file %s: %m", path); ++ } ++ } else ++ st = &stbuf; ++ ++ log_debug("\"%s\" has been created.", path); ++ ++ if (i->argument) { ++ log_debug("Writing to \"%s\".", path); ++ ++ r = loop_write(fd, i->argument, strlen(i->argument), false); ++ if (r < 0) { ++ r = erofs ? -EROFS : r; ++ return log_error_errno(r, "Failed to write file %s: %m", path); ++ } ++ } ++ ++ return fd_set_perms(i, fd, st); ++} ++ ++static int copy_files(Item *i) { ++ _cleanup_close_ int dfd = -1, fd = -1; ++ char *bn; ++ int r; ++ ++ log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); ++ ++ bn = basename(i->path); ++ ++ /* Validate the path and use the returned directory fd for copying the ++ * target so we're sure that the path can't be changed behind our ++ * back. */ ++ dfd = path_open_parent_safe(i->path); ++ if (dfd < 0) ++ return dfd; ++ ++ r = copy_tree_at(AT_FDCWD, i->argument, ++ dfd, bn, ++ i->uid_set ? i->uid : UID_INVALID, ++ i->gid_set ? i->gid : GID_INVALID, ++ COPY_REFLINK); ++ if (r < 0) { ++ struct stat a, b; ++ ++ /* If the target already exists on read-only filesystems, trying ++ * to create the target will not fail with EEXIST but with ++ * EROFS. */ ++ if (r == -EROFS && faccessat(dfd, bn, F_OK, AT_SYMLINK_NOFOLLOW) == 0) ++ r = -EEXIST; ++ ++ if (r != -EEXIST) ++ return log_error_errno(r, "Failed to copy files to %s: %m", i->path); ++ ++ if (stat(i->argument, &a) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->argument); ++ ++ if (fstatat(dfd, bn, &b, AT_SYMLINK_NOFOLLOW) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->path); ++ ++ if ((a.st_mode ^ b.st_mode) & S_IFMT) { ++ log_debug("Can't copy to %s, file exists already and is of different type", i->path); ++ return 0; ++ } ++ } ++ ++ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); ++ ++ return fd_set_perms(i, fd, NULL); ++} ++ ++typedef enum { ++ CREATION_NORMAL, ++ CREATION_EXISTING, ++ CREATION_FORCE, ++ _CREATION_MODE_MAX, ++ _CREATION_MODE_INVALID = -1 ++} CreationMode; ++ ++static const char *creation_mode_verb_table[_CREATION_MODE_MAX] = { ++ [CREATION_NORMAL] = "Created", ++ [CREATION_EXISTING] = "Found existing", ++ [CREATION_FORCE] = "Created replacement", ++}; ++ ++DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(creation_mode_verb, CreationMode); ++ ++static int create_directory_or_subvolume(const char *path, mode_t mode, bool subvol) { ++ _cleanup_close_ int pfd = -1; ++ CreationMode creation; ++ int r; ++ ++ assert(path); ++ ++ pfd = path_open_parent_safe(path); ++ if (pfd < 0) ++ return pfd; ++ ++ if (subvol) { ++ if (btrfs_is_subvol(empty_to_root(arg_root)) <= 0) ++ ++ /* Don't create a subvolume unless the root directory is ++ * one, too. We do this under the assumption that if the ++ * root directory is just a plain directory (i.e. very ++ * light-weight), we shouldn't try to split it up into ++ * subvolumes (i.e. more heavy-weight). Thus, chroot() ++ * environments and suchlike will get a full brtfs ++ * subvolume set up below their tree only if they ++ * specifically set up a btrfs subvolume for the root ++ * dir too. */ ++ ++ subvol = false; ++ else { ++ RUN_WITH_UMASK((~mode) & 0777) ++ r = btrfs_subvol_make_fd(pfd, basename(path)); ++ } ++ } else ++ r = 0; ++ ++ if (!subvol || r == -ENOTTY) ++ RUN_WITH_UMASK(0000) ++ r = mkdirat_label(pfd, basename(path), mode); ++ ++ if (r < 0) { ++ int k; ++ ++ if (!IN_SET(r, -EEXIST, -EROFS)) ++ return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", path); ++ ++ k = is_dir_fd(pfd); ++ if (k == -ENOENT && r == -EROFS) ++ return log_error_errno(r, "%s does not exist and cannot be created as the file system is read-only.", path); ++ if (k < 0) ++ return log_error_errno(k, "Failed to check if %s exists: %m", path); ++ if (!k) { ++ log_warning("\"%s\" already exists and is not a directory.", path); ++ return -EEXIST; ++ } ++ ++ creation = CREATION_EXISTING; ++ } else ++ creation = CREATION_NORMAL; ++ ++ log_debug("%s directory \"%s\".", creation_mode_verb_to_string(creation), path); ++ ++ r = openat(pfd, basename(path), O_NOCTTY|O_CLOEXEC|O_DIRECTORY); + if (r < 0) +- return r; ++ return -errno; ++ return r; ++} + +- return 0; ++static int create_directory(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1; ++ ++ assert(i); ++ assert(IN_SET(i->type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY)); ++ ++ fd = create_directory_or_subvolume(path, i->mode, false); ++ if (fd == -EEXIST) ++ return 0; ++ if (fd < 0) ++ return fd; ++ ++ return fd_set_perms(i, fd, NULL); ++} ++ ++static int create_subvolume(Item *i, const char *path) { ++ _cleanup_close_ int fd = -1; ++ int r, q = 0; ++ ++ assert(i); ++ assert(IN_SET(i->type, CREATE_SUBVOLUME, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)); ++ ++ fd = create_directory_or_subvolume(path, i->mode, true); ++ if (fd == -EEXIST) ++ return 0; ++ if (fd < 0) ++ return fd; ++ ++ if (IN_SET(i->type, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)) { ++ r = btrfs_subvol_auto_qgroup_fd(fd, 0, i->type == CREATE_SUBVOLUME_NEW_QUOTA); ++ if (r == -ENOTTY) ++ log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (unsupported fs or dir not a subvolume): %m", i->path); ++ else if (r == -EROFS) ++ log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (fs is read-only).", i->path); ++ else if (r == -ENOPROTOOPT) ++ log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (quota support is disabled).", i->path); ++ else if (r < 0) ++ q = log_error_errno(r, "Failed to adjust quota for subvolume \"%s\": %m", i->path); ++ else if (r > 0) ++ log_debug("Adjusted quota for subvolume \"%s\".", i->path); ++ else if (r == 0) ++ log_debug("Quota for subvolume \"%s\" already in place, no change made.", i->path); ++ } ++ ++ r = fd_set_perms(i, fd, NULL); ++ if (q < 0) ++ return q; ++ ++ return r; ++} ++ ++static int empty_directory(Item *i, const char *path) { ++ int r; ++ ++ assert(i); ++ assert(i->type == EMPTY_DIRECTORY); ++ ++ r = is_dir(path, false); ++ if (r == -ENOENT) { ++ /* Option "e" operates only on existing objects. Do not ++ * print errors about non-existent files or directories */ ++ log_debug("Skipping missing directory: %s", path); ++ return 0; ++ } ++ if (r < 0) ++ return log_error_errno(r, "is_dir() failed on path %s: %m", path); ++ ++ return path_set_perms(i, path); ++} ++ ++static int create_device(Item *i, mode_t file_type) { ++ _cleanup_close_ int dfd = -1, fd = -1; ++ CreationMode creation; ++ char *bn; ++ int r; ++ ++ assert(i); ++ assert(IN_SET(file_type, S_IFBLK, S_IFCHR)); ++ ++ bn = basename(i->path); ++ ++ /* Validate the path and use the returned directory fd for copying the ++ * target so we're sure that the path can't be changed behind our ++ * back. */ ++ dfd = path_open_parent_safe(i->path); ++ if (dfd < 0) ++ return dfd; ++ ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(i->path, file_type); ++ r = mknodat(dfd, bn, i->mode | file_type, i->major_minor); ++ mac_selinux_create_file_clear(); ++ } ++ ++ if (r < 0) { ++ struct stat st; ++ ++ if (errno == EPERM) { ++ log_debug("We lack permissions, possibly because of cgroup configuration; " ++ "skipping creation of device node %s.", i->path); ++ return 0; ++ } ++ ++ if (errno != EEXIST) ++ return log_error_errno(errno, "Failed to create device node %s: %m", i->path); ++ ++ if (fstatat(dfd, bn, &st, 0) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->path); ++ ++ if ((st.st_mode & S_IFMT) != file_type) { ++ ++ if (i->force) { ++ ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(i->path, file_type); ++ /* FIXME: need to introduce mknodat_atomic() */ ++ r = mknod_atomic(i->path, i->mode | file_type, i->major_minor); ++ mac_selinux_create_file_clear(); ++ } ++ ++ if (r < 0) ++ return log_error_errno(r, "Failed to create device node \"%s\": %m", i->path); ++ creation = CREATION_FORCE; ++ } else { ++ log_debug("%s is not a device node.", i->path); ++ return 0; ++ } ++ } else ++ creation = CREATION_EXISTING; ++ } else ++ creation = CREATION_NORMAL; ++ ++ log_debug("%s %s device node \"%s\" %u:%u.", ++ creation_mode_verb_to_string(creation), ++ i->type == CREATE_BLOCK_DEVICE ? "block" : "char", ++ i->path, major(i->mode), minor(i->mode)); ++ ++ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); ++ ++ return fd_set_perms(i, fd, NULL); ++} ++ ++static int create_fifo(Item *i, const char *path) { ++ _cleanup_close_ int pfd = -1, fd = -1; ++ CreationMode creation; ++ struct stat st; ++ char *bn; ++ int r; ++ ++ pfd = path_open_parent_safe(path); ++ if (pfd < 0) ++ return pfd; ++ ++ bn = basename(path); ++ ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(path, S_IFIFO); ++ r = mkfifoat(pfd, bn, i->mode); ++ mac_selinux_create_file_clear(); ++ } ++ ++ if (r < 0) { ++ if (errno != EEXIST) ++ return log_error_errno(errno, "Failed to create fifo %s: %m", path); ++ ++ if (fstatat(pfd, bn, &st, AT_SYMLINK_NOFOLLOW) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", path); ++ ++ if (!S_ISFIFO(st.st_mode)) { ++ ++ if (i->force) { ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(path, S_IFIFO); ++ r = mkfifoat_atomic(pfd, bn, i->mode); ++ mac_selinux_create_file_clear(); ++ } ++ ++ if (r < 0) ++ return log_error_errno(r, "Failed to create fifo %s: %m", path); ++ creation = CREATION_FORCE; ++ } else { ++ log_warning("\"%s\" already exists and is not a fifo.", path); ++ return 0; ++ } ++ } else ++ creation = CREATION_EXISTING; ++ } else ++ creation = CREATION_NORMAL; ++ ++ log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), path); ++ ++ fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(fd, "Failed to openat(%s): %m", path); ++ ++ return fd_set_perms(i, fd, NULL); + } + + typedef int (*action_t)(Item *, const char *); + typedef int (*fdaction_t)(Item *, int fd, const struct stat *st); + +-static int item_do(Item *i, int fd, const struct stat *st, fdaction_t action) { ++static int item_do(Item *i, int fd, fdaction_t action) { ++ struct stat st; + int r = 0, q; + + assert(i); + assert(fd >= 0); +- assert(st); ++ ++ if (fstat(fd, &st) < 0) { ++ r = -errno; ++ goto finish; ++ } + + /* This returns the first error we run into, but nevertheless + * tries to go on */ +- r = action(i, fd, st); ++ r = action(i, fd, &st); + +- if (S_ISDIR(st->st_mode)) { ++ if (S_ISDIR(st.st_mode)) { + char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; + _cleanup_closedir_ DIR *d = NULL; + struct dirent *de; +@@ -1349,16 +1854,15 @@ static int item_do(Item *i, int fd, const struct stat *st, fdaction_t action) { + } + + FOREACH_DIRENT_ALL(de, d, q = -errno; goto finish) { +- struct stat de_st; + int de_fd; + + if (dot_or_dot_dot(de->d_name)) + continue; + + de_fd = openat(fd, de->d_name, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (de_fd >= 0 && fstat(de_fd, &de_st) >= 0) ++ if (de_fd >= 0) + /* pass ownership of dirent fd over */ +- q = item_do(i, de_fd, &de_st, action); ++ q = item_do(i, de_fd, action); + else + q = -errno; + +@@ -1406,7 +1910,6 @@ static int glob_item_recursively(Item *i, fdaction_t action) { + + STRV_FOREACH(fn, g.gl_pathv) { + _cleanup_close_ int fd = -1; +- struct stat st; + + /* Make sure we won't trigger/follow file object (such as + * device nodes, automounts, ...) pointed out by 'fn' with +@@ -1419,12 +1922,7 @@ static int glob_item_recursively(Item *i, fdaction_t action) { + continue; + } + +- if (fstat(fd, &st) < 0) { +- r = r ?: -errno; +- continue; +- } +- +- k = item_do(i, fd, &st, action); ++ k = item_do(i, fd, action); + if (k < 0 && r == 0) + r = k; + +@@ -1435,27 +1933,9 @@ static int glob_item_recursively(Item *i, fdaction_t action) { + return r; + } + +-typedef enum { +- CREATION_NORMAL, +- CREATION_EXISTING, +- CREATION_FORCE, +- _CREATION_MODE_MAX, +- _CREATION_MODE_INVALID = -1 +-} CreationMode; +- +-static const char *creation_mode_verb_table[_CREATION_MODE_MAX] = { +- [CREATION_NORMAL] = "Created", +- [CREATION_EXISTING] = "Found existing", +- [CREATION_FORCE] = "Created replacement", +-}; +- +-DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(creation_mode_verb, CreationMode); +- + static int create_item(Item *i) { +- struct stat st; +- int r = 0; +- int q = 0; + CreationMode creation; ++ int r = 0; + + assert(i); + +@@ -1470,51 +1950,31 @@ static int create_item(Item *i) { + return 0; + + case CREATE_FILE: +- case TRUNCATE_FILE: + RUN_WITH_UMASK(0000) + (void) mkdir_parents_label(i->path, 0755); + +- r = write_one_file(i, i->path); ++ r = create_file(i, i->path); + if (r < 0) + return r; + break; + +- case COPY_FILES: { +- ++ case TRUNCATE_FILE: + RUN_WITH_UMASK(0000) + (void) mkdir_parents_label(i->path, 0755); + +- log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); +- r = copy_tree(i->argument, i->path, +- i->uid_set ? i->uid : UID_INVALID, +- i->gid_set ? i->gid : GID_INVALID, +- COPY_REFLINK); +- +- if (r == -EROFS && stat(i->path, &st) == 0) +- r = -EEXIST; +- +- if (r < 0) { +- struct stat a, b; +- +- if (r != -EEXIST) +- return log_error_errno(r, "Failed to copy files to %s: %m", i->path); +- +- if (stat(i->argument, &a) < 0) +- return log_error_errno(errno, "stat(%s) failed: %m", i->argument); ++ r = truncate_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + +- if (stat(i->path, &b) < 0) +- return log_error_errno(errno, "stat(%s) failed: %m", i->path); ++ case COPY_FILES: { + +- if ((a.st_mode ^ b.st_mode) & S_IFMT) { +- log_debug("Can't copy to %s, file exists already and is of different type", i->path); +- return 0; +- } +- } ++ RUN_WITH_UMASK(0000) ++ (void) mkdir_parents_label(i->path, 0755); + +- r = path_set_perms(i, i->path); ++ r = copy_files(i); + if (r < 0) + return r; +- + break; + + case WRITE_FILE: +@@ -1526,132 +1986,39 @@ static int create_item(Item *i) { + + case CREATE_DIRECTORY: + case TRUNCATE_DIRECTORY: ++ RUN_WITH_UMASK(0000) ++ (void) mkdir_parents_label(i->path, 0755); ++ ++ r = create_directory(i, i->path); ++ if (r < 0) ++ return r; ++ break; ++ + case CREATE_SUBVOLUME: + case CREATE_SUBVOLUME_INHERIT_QUOTA: + case CREATE_SUBVOLUME_NEW_QUOTA: + RUN_WITH_UMASK(0000) + (void) mkdir_parents_label(i->path, 0755); + +- if (IN_SET(i->type, CREATE_SUBVOLUME, CREATE_SUBVOLUME_INHERIT_QUOTA, CREATE_SUBVOLUME_NEW_QUOTA)) { +- +- if (btrfs_is_subvol(isempty(arg_root) ? "/" : arg_root) <= 0) +- +- /* Don't create a subvolume unless the +- * root directory is one, too. We do +- * this under the assumption that if +- * the root directory is just a plain +- * directory (i.e. very light-weight), +- * we shouldn't try to split it up +- * into subvolumes (i.e. more +- * heavy-weight). Thus, chroot() +- * environments and suchlike will get +- * a full brtfs subvolume set up below +- * their tree only if they +- * specifically set up a btrfs +- * subvolume for the root dir too. */ +- +- r = -ENOTTY; +- else { +- RUN_WITH_UMASK((~i->mode) & 0777) +- r = btrfs_subvol_make(i->path); +- } +- } else +- r = 0; +- +- if (IN_SET(i->type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY) || r == -ENOTTY) +- RUN_WITH_UMASK(0000) +- r = mkdir_label(i->path, i->mode); +- +- if (r < 0) { +- int k; +- +- if (!IN_SET(r, -EEXIST, -EROFS)) +- return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", i->path); +- +- k = is_dir(i->path, false); +- if (k == -ENOENT && r == -EROFS) +- return log_error_errno(r, "%s does not exist and cannot be created as the file system is read-only.", i->path); +- if (k < 0) +- return log_error_errno(k, "Failed to check if %s exists: %m", i->path); +- if (!k) { +- log_warning("\"%s\" already exists and is not a directory.", i->path); +- return 0; +- } +- +- creation = CREATION_EXISTING; +- } else +- creation = CREATION_NORMAL; +- +- log_debug("%s directory \"%s\".", creation_mode_verb_to_string(creation), i->path); +- +- if (IN_SET(i->type, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)) { +- r = btrfs_subvol_auto_qgroup(i->path, 0, i->type == CREATE_SUBVOLUME_NEW_QUOTA); +- if (r == -ENOTTY) +- log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (unsupported fs or dir not a subvolume): %m", i->path); +- else if (r == -EROFS) +- log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (fs is read-only).", i->path); +- else if (r == -ENOPROTOOPT) +- log_debug_errno(r, "Couldn't adjust quota for subvolume \"%s\" (quota support is disabled).", i->path); +- else if (r < 0) +- q = log_error_errno(r, "Failed to adjust quota for subvolume \"%s\": %m", i->path); +- else if (r > 0) +- log_debug("Adjusted quota for subvolume \"%s\".", i->path); +- else if (r == 0) +- log_debug("Quota for subvolume \"%s\" already in place, no change made.", i->path); +- } ++ r = create_subvolume(i, i->path); ++ if (r < 0) ++ return r; ++ break; + +- _fallthrough_; + case EMPTY_DIRECTORY: +- r = path_set_perms(i, i->path); +- if (q < 0) +- return q; ++ r = empty_directory(i, i->path); + if (r < 0) + return r; + + break; + + case CREATE_FIFO: +- RUN_WITH_UMASK(0000) { ++ RUN_WITH_UMASK(0000) + (void) mkdir_parents_label(i->path, 0755); + +- mac_selinux_create_file_prepare(i->path, S_IFIFO); +- r = mkfifo(i->path, i->mode); +- mac_selinux_create_file_clear(); +- } +- +- if (r < 0) { +- if (errno != EEXIST) +- return log_error_errno(errno, "Failed to create fifo %s: %m", i->path); +- +- if (lstat(i->path, &st) < 0) +- return log_error_errno(errno, "stat(%s) failed: %m", i->path); +- +- if (!S_ISFIFO(st.st_mode)) { +- +- if (i->force) { +- RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, S_IFIFO); +- r = mkfifo_atomic(i->path, i->mode); +- mac_selinux_create_file_clear(); +- } +- +- if (r < 0) +- return log_error_errno(r, "Failed to create fifo %s: %m", i->path); +- creation = CREATION_FORCE; +- } else { +- log_warning("\"%s\" already exists and is not a fifo.", i->path); +- return 0; +- } +- } else +- creation = CREATION_EXISTING; +- } else +- creation = CREATION_NORMAL; +- log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), i->path); +- +- r = path_set_perms(i, i->path); ++ r = create_fifo(i, i->path); + if (r < 0) + return r; +- + break; + } + +@@ -1704,9 +2071,7 @@ static int create_item(Item *i) { + } + + case CREATE_BLOCK_DEVICE: +- case CREATE_CHAR_DEVICE: { +- mode_t file_type; +- ++ case CREATE_CHAR_DEVICE: + if (have_effective_cap(CAP_MKNOD) == 0) { + /* In a container we lack CAP_MKNOD. We + shouldn't attempt to create the device node in +@@ -1720,60 +2085,11 @@ static int create_item(Item *i) { + RUN_WITH_UMASK(0000) + (void) mkdir_parents_label(i->path, 0755); + +- file_type = i->type == CREATE_BLOCK_DEVICE ? S_IFBLK : S_IFCHR; +- +- RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, file_type); +- r = mknod(i->path, i->mode | file_type, i->major_minor); +- mac_selinux_create_file_clear(); +- } +- +- if (r < 0) { +- if (errno == EPERM) { +- log_debug("We lack permissions, possibly because of cgroup configuration; " +- "skipping creation of device node %s.", i->path); +- return 0; +- } +- +- if (errno != EEXIST) +- return log_error_errno(errno, "Failed to create device node %s: %m", i->path); +- +- if (lstat(i->path, &st) < 0) +- return log_error_errno(errno, "stat(%s) failed: %m", i->path); +- +- if ((st.st_mode & S_IFMT) != file_type) { +- +- if (i->force) { +- +- RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, file_type); +- r = mknod_atomic(i->path, i->mode | file_type, i->major_minor); +- mac_selinux_create_file_clear(); +- } +- +- if (r < 0) +- return log_error_errno(r, "Failed to create device node \"%s\": %m", i->path); +- creation = CREATION_FORCE; +- } else { +- log_debug("%s is not a device node.", i->path); +- return 0; +- } +- } else +- creation = CREATION_EXISTING; +- } else +- creation = CREATION_NORMAL; +- +- log_debug("%s %s device node \"%s\" %u:%u.", +- creation_mode_verb_to_string(creation), +- i->type == CREATE_BLOCK_DEVICE ? "block" : "char", +- i->path, major(i->mode), minor(i->mode)); +- +- r = path_set_perms(i, i->path); ++ r = create_device(i, i->type == CREATE_BLOCK_DEVICE ? S_IFBLK : S_IFCHR); + if (r < 0) + return r; + + break; +- } + + case ADJUST_MODE: + case RELABEL_PATH: +-- +2.11.0 + diff --git a/meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch b/meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch new file mode 100644 index 0000000000..c0b0667d85 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0024-journald-do-not-store-the-iovec-entry-for-process-co.patch @@ -0,0 +1,193 @@ +From c29b44cb90e2cc521533e6169cf847553ebefd81 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Wed, 5 Dec 2018 18:38:39 +0100 +Subject: [PATCH] journald: do not store the iovec entry for process + commandline on stack + +This fixes a crash where we would read the commandline, whose length is under +control of the sending program, and then crash when trying to create a stack +allocation for it. + +CVE-2018-16864 +https://bugzilla.redhat.com/show_bug.cgi?id=1653855 + +The message actually doesn't get written to disk, because +journal_file_append_entry() returns -E2BIG. + +Patch for 237 from: +systemd_237-3ubuntu10.13.debian CVE-2018-16864.patch + +CVE: CVE-2018-16864 +Upstream-Status: Backport + +--- + src/basic/io-util.c | 10 ++++++++++ + src/basic/io-util.h | 2 ++ + src/coredump/coredump.c | 31 +++++++++++-------------------- + src/journal/journald-server.c | 25 +++++++++++++++---------- + 4 files changed, 38 insertions(+), 30 deletions(-) + +--- a/src/basic/io-util.c ++++ b/src/basic/io-util.c +@@ -26,6 +26,7 @@ + #include <unistd.h> + + #include "io-util.h" ++#include "string-util.h" + #include "time-util.h" + + int flush_fd(int fd) { +@@ -270,3 +271,12 @@ + + return q - (const uint8_t*) p; + } ++ ++char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { ++ char *x; ++ ++ x = strappend(field, value); ++ if (x) ++ iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); ++ return x; ++} +--- a/src/basic/io-util.h ++++ b/src/basic/io-util.h +@@ -91,3 +91,5 @@ + #define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len) + #define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string)) + #define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string) ++ ++char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value); +--- a/src/coredump/coredump.c ++++ b/src/coredump/coredump.c +@@ -1067,19 +1067,10 @@ + return 0; + } + +-static char* set_iovec_field(struct iovec iovec[27], size_t *n_iovec, const char *field, const char *value) { +- char *x; +- +- x = strappend(field, value); +- if (x) +- iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); +- return x; +-} +- + static char* set_iovec_field_free(struct iovec iovec[27], size_t *n_iovec, const char *field, char *value) { + char *x; + +- x = set_iovec_field(iovec, n_iovec, field, value); ++ x = set_iovec_string_field(iovec, n_iovec, field, value); + free(value); + return x; + } +@@ -1129,33 +1120,33 @@ + disable_coredumps(); + } + +- set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); ++ set_iovec_string_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); + } + + if (cg_pid_get_user_unit(pid, &t) >= 0) + set_iovec_field_free(iovec, n_iovec, "COREDUMP_USER_UNIT=", t); + + /* The next few are mandatory */ +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) + return log_oom(); + +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) + return log_oom(); + +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) + return log_oom(); + +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) + return log_oom(); + +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) + return log_oom(); + +- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) ++ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) + return log_oom(); + + if (context[CONTEXT_EXE] && +- !set_iovec_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) ++ !set_iovec_string_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) + return log_oom(); + + if (sd_pid_get_session(pid, &t) >= 0) +@@ -1223,7 +1214,7 @@ + iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t); + + if (safe_atoi(context[CONTEXT_SIGNAL], &signo) >= 0 && SIGNAL_VALID(signo)) +- set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); ++ set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); + + return 0; /* we successfully acquired all metadata */ + } +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -769,6 +769,7 @@ + pid_t object_pid) { + + char source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)]; ++ _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL; + uid_t journal_uid; + ClientContext *o; + +@@ -785,20 +786,23 @@ + IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->uid, uid_t, uid_is_valid, UID_FMT, "_UID"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->gid, gid_t, gid_is_valid, GID_FMT, "_GID"); + +- IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); +- IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); +- IOVEC_ADD_STRING_FIELD(iovec, n, c->cmdline, "_CMDLINE"); +- IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); ++ IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); /* At most TASK_COMM_LENGTH (16 bytes) */ ++ IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); /* A path, so at most PATH_MAX (4096 bytes) */ + +- IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); ++ if (c->cmdline) ++ /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack. ++ * Let's use a heap allocation for this one. */ ++ cmdline1 = set_iovec_string_field(iovec, &n, "_CMDLINE=", c->cmdline); + ++ IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); /* Read from /proc/.../status */ ++ IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "_AUDIT_SESSION"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->loginuid, uid_t, uid_is_valid, UID_FMT, "_AUDIT_LOGINUID"); + +- IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); ++ IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); /* A path */ + IOVEC_ADD_STRING_FIELD(iovec, n, c->session, "_SYSTEMD_SESSION"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->owner_uid, uid_t, uid_is_valid, UID_FMT, "_SYSTEMD_OWNER_UID"); +- IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); ++ IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); /* Unit names are bounded by UNIT_NAME_MAX */ + IOVEC_ADD_STRING_FIELD(iovec, n, c->user_unit, "_SYSTEMD_USER_UNIT"); + IOVEC_ADD_STRING_FIELD(iovec, n, c->slice, "_SYSTEMD_SLICE"); + IOVEC_ADD_STRING_FIELD(iovec, n, c->user_slice, "_SYSTEMD_USER_SLICE"); +@@ -819,13 +823,14 @@ + IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->uid, uid_t, uid_is_valid, UID_FMT, "OBJECT_UID"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->gid, gid_t, gid_is_valid, GID_FMT, "OBJECT_GID"); + ++ /* See above for size limits, only ->cmdline may be large, so use a heap allocation for it. */ + IOVEC_ADD_STRING_FIELD(iovec, n, o->comm, "OBJECT_COMM"); + IOVEC_ADD_STRING_FIELD(iovec, n, o->exe, "OBJECT_EXE"); +- IOVEC_ADD_STRING_FIELD(iovec, n, o->cmdline, "OBJECT_CMDLINE"); +- IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); ++ if (o->cmdline) ++ cmdline2 = set_iovec_string_field(iovec, &n, "OBJECT_CMDLINE=", o->cmdline); + ++ IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); + IOVEC_ADD_SIZED_FIELD(iovec, n, o->label, o->label_size, "OBJECT_SELINUX_CONTEXT"); +- + IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "OBJECT_AUDIT_SESSION"); + IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->loginuid, uid_t, uid_is_valid, UID_FMT, "OBJECT_AUDIT_LOGINUID"); + diff --git a/meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields-1k.patch b/meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields-1k.patch new file mode 100644 index 0000000000..e8a6f2b986 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0025-journald-set-a-limit-on-the-number-of-fields-1k.patch @@ -0,0 +1,60 @@ +From 4566aaf97f5b4143b930d75628f3abc905249dcd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Wed, 5 Dec 2018 22:45:02 +0100 +Subject: [PATCH] journald: set a limit on the number of fields (1k) + +We allocate a iovec entry for each field, so with many short entries, +our memory usage and processing time can be large, even with a relatively +small message size. Let's refuse overly long entries. + +CVE-2018-16865 +https://bugzilla.redhat.com/show_bug.cgi?id=1653861 + +What from I can see, the problem is not from an alloca, despite what the CVE +description says, but from the attack multiplication that comes from creating +many very small iovecs: (void* + size_t) for each three bytes of input message. + +Patch backported from systemd master at +052c57f132f04a3cf4148f87561618da1a6908b4. + +CVE: CVE-2018-16865 +Upstream-Status: Backport + +--- + src/basic/journal-importer.h | 3 +++ + src/journal/journald-native.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/basic/journal-importer.h b/src/basic/journal-importer.h +index f49ce734a1..c4ae45d32d 100644 +--- a/src/basic/journal-importer.h ++++ b/src/basic/journal-importer.h +@@ -16,6 +16,9 @@ + #define DATA_SIZE_MAX (1024*1024*768u) + #define LINE_CHUNK 8*1024u + ++/* The maximum number of fields in an entry */ ++#define ENTRY_FIELD_COUNT_MAX 1024 ++ + struct iovec_wrapper { + struct iovec *iovec; + size_t size_bytes; +diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c +index 5ff22a10af..951d092053 100644 +--- a/src/journal/journald-native.c ++++ b/src/journal/journald-native.c +@@ -140,6 +140,11 @@ static int server_process_entry( + } + + /* A property follows */ ++ if (n > ENTRY_FIELD_COUNT_MAX) { ++ log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry."); ++ r = 1; ++ goto finish; ++ } + + /* n existing properties, 1 new, +1 for _TRANSPORT */ + if (!GREEDY_REALLOC(iovec, m, +-- +2.11.0 + diff --git a/meta/recipes-core/systemd/systemd/0026-journal-remote-set-a-limit-on-the-number-of-fields-i.patch b/meta/recipes-core/systemd/systemd/0026-journal-remote-set-a-limit-on-the-number-of-fields-i.patch new file mode 100644 index 0000000000..f297333e72 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0026-journal-remote-set-a-limit-on-the-number-of-fields-i.patch @@ -0,0 +1,79 @@ +From ce1475b4f69f0a4382c6190f55e080d91de84611 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Fri, 7 Dec 2018 10:48:10 +0100 +Subject: [PATCH] journal-remote: set a limit on the number of fields in a + message + +Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is +reused for the new error condition (too many fields). + +This matches the change done for systemd-journald, hence forming the second +part of the fix for CVE-2018-16865 +(https://bugzilla.redhat.com/show_bug.cgi?id=1653861). + +Patch backported from systemd master at +ef4d6abe7c7fab6cbff975b32e76b09feee56074. + +Patch for 237 from: +systemd_237-3ubuntu10.13.debian CVE-2018-16865_2.patch + +CVE: CVE-2018-16865 +Upstream-Status: Backport + +--- + src/journal-remote/journal-remote-main.c | 7 +++++-- + src/journal-remote/journal-remote.c | 3 +++ + src/shared/journal-importer.c | 5 ++++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +--- a/src/basic/journal-importer.c ++++ b/src/basic/journal-importer.c +@@ -38,6 +38,9 @@ + }; + + static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { ++ if (iovw->count >= ENTRY_FIELD_COUNT_MAX) ++ return -E2BIG; ++ + if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1)) + return log_oom(); + +@@ -113,7 +116,7 @@ + imp->scanned = imp->filled; + if (imp->scanned >= DATA_SIZE_MAX) { + log_error("Entry is bigger than %u bytes.", DATA_SIZE_MAX); +- return -E2BIG; ++ return -ENOBUFS; + } + + if (imp->passive_fd) +--- a/src/journal-remote/journal-remote.c ++++ b/src/journal-remote/journal-remote.c +@@ -517,10 +517,16 @@ + break; + else if (r < 0) { + log_warning("Failed to process data for connection %p", connection); +- if (r == -E2BIG) ++ if (r == -ENOBUFS) + return mhd_respondf(connection, + r, MHD_HTTP_PAYLOAD_TOO_LARGE, + "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes."); ++ ++ else if (r == -E2BIG) ++ return mhd_respondf(connection, ++ r, MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, ++ "Entry with more fields than the maximum of " STRINGIFY(ENTRY_FIELD_COUNT_MAX) "."); ++ + else + return mhd_respondf(connection, + r, MHD_HTTP_UNPROCESSABLE_ENTITY, +@@ -1090,6 +1096,9 @@ + log_debug("%zu active sources remaining", s->active); + return 0; + } else if (r == -E2BIG) { ++ log_notice("Entry with too many fields, skipped"); ++ return 1; ++ } else if (r == -ENOBUFS) { + log_notice_errno(E2BIG, "Entry too big, skipped"); + return 1; + } else if (r == -EAGAIN) { diff --git a/meta/recipes-core/systemd/systemd/0027-journal-fix-out-of-bounds-read-CVE-2018-16866.patch b/meta/recipes-core/systemd/systemd/0027-journal-fix-out-of-bounds-read-CVE-2018-16866.patch new file mode 100644 index 0000000000..3925a4abbb --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0027-journal-fix-out-of-bounds-read-CVE-2018-16866.patch @@ -0,0 +1,49 @@ +From ebd06c37d4311db9851f4d3fdd023de3dd590de0 Mon Sep 17 00:00:00 2001 +From: Filipe Brandenburger <filbranden@google.com> +Date: Thu, 10 Jan 2019 14:53:33 -0800 +Subject: [PATCH] journal: fix out-of-bounds read CVE-2018-16866 + +The original code didn't account for the fact that strchr() would match on the +'\0' character, making it read past the end of the buffer if no non-whitespace +character was present. + +This bug was introduced in commit ec5ff4445cca6a which was first released in +systemd v221 and later fixed in commit 8595102d3ddde6 which was released in +v240, so versions in the range [v221, v240) are affected. + +Patch backported from systemd-stable at f005e73d3723d62a39be661931fcb6347119b52b +also includes a change from systemd master which removes a heap buffer overflow +a6aadf4ae0bae185dc4c414d492a4a781c80ffe5. + +CVE: CVE-2018-16866 +Upstream-Status: Backport +Signed-off-by: Marcus Cooper <marcusc@axis.com> +--- + src/journal/journald-syslog.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c +index 9dea116722..809b318c06 100644 +--- a/src/journal/journald-syslog.c ++++ b/src/journal/journald-syslog.c +@@ -194,7 +194,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid) + e = l; + l--; + +- if (p[l-1] == ']') { ++ if (l > 0 && p[l-1] == ']') { + size_t k = l-1; + + for (;;) { +@@ -219,7 +219,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid) + if (t) + *identifier = t; + +- if (strchr(WHITESPACE, p[e])) ++ if (p[e] != '\0' && strchr(WHITESPACE, p[e])) + e++; + *buf = p + e; + return e; +-- +2.11.0 + diff --git a/meta/recipes-core/systemd/systemd/CVE-2019-6454.patch b/meta/recipes-core/systemd/systemd/CVE-2019-6454.patch new file mode 100644 index 0000000000..e3c67c166c --- /dev/null +++ b/meta/recipes-core/systemd/systemd/CVE-2019-6454.patch @@ -0,0 +1,210 @@ +Description: sd-bus: enforce a size limit for dbus paths, and don't allocate + them on the stacka +Forwarded: no + +Patch from: systemd_237-3ubuntu10.13 + +For information see: +https://usn.ubuntu.com/3891-1/ +https://git.launchpad.net/ubuntu/+source/systemd/commit/?h=applied/ubuntu/bionic-updates&id=d7584b894afcaa8a4a1abb69db2a9c81a6276e80 + +CVE: CVE-2019-6454 +Upstream-Status: Backport + +Signed-off-by: George McCollister <george.mccollister@gmail.com> + +--- a/src/libsystemd/sd-bus/bus-internal.c ++++ b/src/libsystemd/sd-bus/bus-internal.c +@@ -61,7 +61,7 @@ + if (slash) + return false; + +- return true; ++ return (q - p) <= BUS_PATH_SIZE_MAX; + } + + char* object_path_startswith(const char *a, const char *b) { +--- a/src/libsystemd/sd-bus/bus-internal.h ++++ b/src/libsystemd/sd-bus/bus-internal.h +@@ -339,6 +339,10 @@ + + #define BUS_MESSAGE_SIZE_MAX (64*1024*1024) + #define BUS_AUTH_SIZE_MAX (64*1024) ++/* Note that the D-Bus specification states that bus paths shall have no size limit. We enforce here one ++ * anyway, since truly unbounded strings are a security problem. The limit we pick is relatively large however, ++ * to not clash unnecessarily with real-life applications. */ ++#define BUS_PATH_SIZE_MAX (64*1024) + + #define BUS_CONTAINER_DEPTH 128 + +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -1150,7 +1150,8 @@ + const char *path, + sd_bus_error *error) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -1166,7 +1167,12 @@ + return 0; + + /* Second, add fallback vtables registered for any of the prefixes */ +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_manager_serialize_path(bus, reply, prefix, path, true, error); + if (r < 0) +@@ -1362,6 +1368,7 @@ + } + + int bus_process_object(sd_bus *bus, sd_bus_message *m) { ++ _cleanup_free_ char *prefix = NULL; + int r; + size_t pl; + bool found_object = false; +@@ -1386,9 +1393,12 @@ + assert(m->member); + + pl = strlen(m->path); +- do { +- char prefix[pl+1]; ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + ++ do { + bus->nodes_modified = false; + + r = object_find_and_run(bus, m, m->path, false, &found_object); +@@ -1516,9 +1526,15 @@ + + n = hashmap_get(bus->nodes, path); + if (!n) { +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; ++ ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; + +- prefix = alloca(strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + n = hashmap_get(bus->nodes, prefix); + if (n) +@@ -2108,8 +2124,9 @@ + char **names) { + + BUS_DONT_DESTROY(bus); ++ _cleanup_free_ char *prefix = NULL; + bool found_interface = false; +- char *prefix; ++ size_t pl; + int r; + + assert_return(bus, -EINVAL); +@@ -2128,6 +2145,12 @@ + if (names && names[0] == NULL) + return 0; + ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + do { + bus->nodes_modified = false; + +@@ -2137,7 +2160,6 @@ + if (bus->nodes_modified) + continue; + +- prefix = alloca(strlen(path) + 1); + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names); + if (r != 0) +@@ -2269,7 +2291,8 @@ + + static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2314,7 +2337,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_added_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2453,7 +2481,8 @@ + + static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char *path) { + _cleanup_set_free_ Set *s = NULL; +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2485,7 +2514,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = object_removed_append_all_prefix(bus, m, s, prefix, path, true); + if (r < 0) +@@ -2635,7 +2669,8 @@ + const char *path, + const char *interface) { + +- char *prefix; ++ _cleanup_free_ char *prefix = NULL; ++ size_t pl; + int r; + + assert(bus); +@@ -2649,7 +2684,12 @@ + if (bus->nodes_modified) + return 0; + +- prefix = alloca(strlen(path) + 1); ++ pl = strlen(path); ++ assert(pl <= BUS_PATH_SIZE_MAX); ++ prefix = new(char, pl + 1); ++ if (!prefix) ++ return -ENOMEM; ++ + OBJECT_PATH_FOREACH_PREFIX(prefix, path) { + r = interfaces_added_append_one_prefix(bus, m, prefix, path, interface, true); + if (r != 0) diff --git a/meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch b/meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch new file mode 100644 index 0000000000..4ffa739145 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch @@ -0,0 +1,61 @@ +Description: sd-bus: if we receive an invalid dbus message, ignore and + proceeed + . + dbus-daemon might have a slightly different idea of what a valid msg is + than us (for example regarding valid msg and field sizes). Let's hence + try to proceed if we can and thus drop messages rather than fail the + connection if we fail to validate a message. + . + Hopefully the differences in what is considered valid are not visible + for real-life usecases, but are specific to exploit attempts only. +Author: Lennart Poettering <lennart@poettering.net> +Forwarded: other,https://github.com/systemd/systemd/pull/11708/ + +Patch from: systemd_237-3ubuntu10.13 + +For information see: +https://usn.ubuntu.com/3891-1/ +https://git.launchpad.net/ubuntu/+source/systemd/commit/?h=applied/ubuntu/bionic-updates&id=d7584b894afcaa8a4a1abb69db2a9c81a6276e80 + +CVE: CVE-2019-6454 +Upstream-Status: Backport + +Signed-off-by: George McCollister <george.mccollister@gmail.com> + +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 30d6455b6f..441b4a816f 100644 +--- a/src/libsystemd/sd-bus/bus-socket.c ++++ b/src/libsystemd/sd-bus/bus-socket.c +@@ -1072,7 +1072,7 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) { + } + + static int bus_socket_make_message(sd_bus *bus, size_t size) { +- sd_bus_message *t; ++ sd_bus_message *t = NULL; + void *b; + int r; + +@@ -1097,7 +1097,9 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) { + bus->fds, bus->n_fds, + NULL, + &t); +- if (r < 0) { ++ if (r == -EBADMSG) ++ log_debug_errno(r, "Received invalid message from connection %s, dropping.", strna(bus->description)); ++ else if (r < 0) { + free(b); + return r; + } +@@ -1108,7 +1110,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) { + bus->fds = NULL; + bus->n_fds = 0; + +- bus->rqueue[bus->rqueue_size++] = t; ++ if (t) ++ bus->rqueue[bus->rqueue_size++] = t; + + return 1; + } +-- +2.17.1 + diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb index a409b18297..a0e5d512e0 100644 --- a/meta/recipes-core/systemd/systemd_237.bb +++ b/meta/recipes-core/systemd/systemd_237.bb @@ -54,6 +54,17 @@ SRC_URI += "file://touchscreen.rules \ file://libmount.patch \ file://0034-Fix-format-truncation-compile-failure-by-typecasting.patch \ file://0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ + file://0001-core-when-deserializing-state-always-use-read_line-L.patch \ + file://0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch \ + file://0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch \ + file://0024-journald-do-not-store-the-iovec-entry-for-process-co.patch \ + file://0025-journald-set-a-limit-on-the-number-of-fields-1k.patch \ + file://0026-journal-remote-set-a-limit-on-the-number-of-fields-i.patch \ + file://0027-journal-fix-out-of-bounds-read-CVE-2018-16866.patch \ + file://0001-tmpfiles-don-t-resolve-pathnames-when-traversing-rec.patch \ + file://0002-Make-tmpfiles-safe.patch \ + file://CVE-2019-6454.patch \ + file://sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" @@ -179,7 +190,7 @@ EXTRA_OEMESON += "-Dlink-udev-shared=false" EXTRA_OEMESON += "-Dnobody-user=nobody \ -Dnobody-group=nobody \ - -Droothomedir=${ROOTHOME} \ + -Droothomedir=${ROOT_HOME} \ -Drootlibdir=${rootlibdir} \ -Drootprefix=${rootprefix} \ -Dsysvrcnd-path=${sysconfdir} \ diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts index 307feb7187..95eff04e17 100755 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts @@ -6,7 +6,8 @@ # # The following script will run all the scriptlets found in #SYSCONFDIR#/deb-postinsts, -# #SYSCONFDIR#/ipk-postinsts or #SYSCONFDIR#/rpm-postinsts. +# #SYSCONFDIR#/ipk-postinsts or #SYSCONFDIR#/rpm-postinsts or the package manager in +# case available. # the order of this list is important, do not change! backend_list="rpm deb ipk" @@ -14,27 +15,29 @@ backend_list="rpm deb ipk" pm_installed=false for pm in $backend_list; do - pi_dir="#SYSCONFDIR#/$pm-postinsts" - - if [ ! -d $pi_dir ]; then - continue - fi - # found the package manager, it has postinsts case $pm in "deb") if [ -s "#LOCALSTATEDIR#/lib/dpkg/status" ]; then pm_installed=true + break fi ;; "ipk") if [ -s "#LOCALSTATEDIR#/lib/opkg/status" ]; then pm_installed=true + break fi ;; esac - break + + pi_dir="#SYSCONFDIR#/$pm-postinsts" + + # found postinsts directory + if [ -d $pi_dir ]; then + break + fi done remove_rcsd_link () { @@ -43,7 +46,7 @@ remove_rcsd_link () { fi } -if ! [ -d $pi_dir ]; then +if ! [ -d $pi_dir ] && ! $pm_installed; then remove_rcsd_link exit 0 fi diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service index 1b71a1f8be..d42addf510 100644 --- a/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +++ b/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service @@ -3,7 +3,6 @@ Description=Run pending postinsts DefaultDependencies=no After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount Before=sysinit.target -ConditionPathExistsGlob=#SYSCONFDIR#/*-postinsts [Service] Type=oneshot diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb index 6146966894..cbe557aba2 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.10.6.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.9.bb @@ -16,8 +16,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRC_URI[md5sum] = "8110099f4615fc89a74ffe9189b56cfc" -SRC_URI[sha256sum] = "04a080c81743eb29d181bac29ceb0c15819a2f4210793f2cc9958d885435029f" +SRC_URI[md5sum] = "09df0ac2e8f245740a2f32411d10c0d1" +SRC_URI[sha256sum] = "a1855bbd02d0f71ebd180e9872309862036624f012442ab9cc5852eb60340145" export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb index 93626dd4b5..1cbbf8763c 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.11.bb @@ -32,8 +32,8 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://run-ptest \ " -SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96" -SRC_URI[sha256sum] = "77839eb6fc6c652125f08acfd9369701c2516eb05cc2084160e7efc7a3fb731c" +SRC_URI[md5sum] = "f9c2b35810790f5bd802483eb14cb301" +SRC_URI[sha256sum] = "2c45144acf8dc6fcd655be7370a022e9c03c8b7419af489c9c2e786a335006db" inherit autotools ptest pkgconfig useradd python3-dir manpages diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb index d79a47931c..b5c43200d6 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.3.bb @@ -23,8 +23,8 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ " -SRC_URI[md5sum] = "4863cc2f9f0a070b42438bb646bbba06" -SRC_URI[sha256sum] = "07cc3c0b71e7b77f1913d5b7f340a78a9af414440e4662712aef2d635b88ee9d" +SRC_URI[md5sum] = "ffcfa8c1ba9a52f002d240e936e9afa2" +SRC_URI[sha256sum] = "9e8420f90d5f963f7aa32bc6d44adc1e491136f687c69ffb7a3075d33b40852b" CVE_PRODUCT = "ust" diff --git a/scripts/combo-layer b/scripts/combo-layer index d04d88b070..dc40e72404 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -246,7 +246,7 @@ def action_init(conf, args): # traditional behavior from "git archive" (preserved # here) it to choose the first one. This might not be # intended, so at least warn about it. - logger.warn("%s: initial revision '%s' not unique, picking result of rev-parse = %s" % + logger.warning("%s: initial revision '%s' not unique, picking result of rev-parse = %s" % (name, initialrev, refs[0])) initialrev = rev except: diff --git a/scripts/contrib/verify-homepage.py b/scripts/contrib/verify-homepage.py index 76f1749cfa..cc6e797d8b 100755 --- a/scripts/contrib/verify-homepage.py +++ b/scripts/contrib/verify-homepage.py @@ -27,7 +27,7 @@ logger = scriptutils.logger_create('verify_homepage') def wgetHomepage(pn, homepage): result = subprocess.call('wget ' + '-q -T 5 -t 1 --spider ' + homepage, shell = True) if result: - logger.warn("%s: failed to verify HOMEPAGE: %s " % (pn, homepage)) + logger.warning("%s: failed to verify HOMEPAGE: %s " % (pn, homepage)) return 1 else: return 0 diff --git a/scripts/lib/devtool/export.py b/scripts/lib/devtool/export.py index 13ee258e7a..35349e2cda 100644 --- a/scripts/lib/devtool/export.py +++ b/scripts/lib/devtool/export.py @@ -84,7 +84,7 @@ def export(args, config, basepath, workspace): # if all workspace is excluded, quit if not len(set(workspace.keys()).difference(set(args.exclude))): - logger.warn('All recipes in workspace excluded, nothing to export') + logger.warning('All recipes in workspace excluded, nothing to export') return 0 exported = [] diff --git a/scripts/lib/devtool/import.py b/scripts/lib/devtool/import.py index c13a180d14..4264b7d820 100644 --- a/scripts/lib/devtool/import.py +++ b/scripts/lib/devtool/import.py @@ -81,7 +81,7 @@ def devimport(args, config, basepath, workspace): break else: non_importables.append(fn) - logger.warn('No recipe to append %s.bbapppend, skipping' % fn) + logger.warning('No recipe to append %s.bbapppend, skipping' % fn) # Extract imported = [] @@ -104,9 +104,9 @@ def devimport(args, config, basepath, workspace): try: tar.extract(member, path=config.workspace_path) except PermissionError as pe: - logger.warn(pe) + logger.warning(pe) else: - logger.warn('File already present. Use --overwrite/-o to overwrite it: %s' % member.name) + logger.warning('File already present. Use --overwrite/-o to overwrite it: %s' % member.name) continue else: tar.extract(member, path=config.workspace_path) @@ -129,7 +129,7 @@ def devimport(args, config, basepath, workspace): if imported: logger.info('Imported recipes into workspace %s: %s' % (config.workspace_path, ', '.join(imported))) else: - logger.warn('No recipes imported into the workspace') + logger.warning('No recipes imported into the workspace') return 0 diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index a1e8e1d322..d14b7a6543 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -66,7 +66,7 @@ def add(args, config, basepath, workspace): args.srctree = args.recipename args.recipename = None elif os.path.isdir(args.recipename): - logger.warn('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) + logger.warning('Ambiguous argument "%s" - assuming you mean it to be the recipe name' % args.recipename) if not args.fetchuri: if args.srcrev: @@ -82,7 +82,7 @@ def add(args, config, basepath, workspace): if args.fetchuri: raise DevtoolError('URI specified as positional argument as well as -f/--fetch') else: - logger.warn('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') + logger.warning('-f/--fetch option is deprecated - you can now simply specify the URL to fetch as a positional argument instead') args.fetchuri = args.fetch if args.recipename: @@ -217,7 +217,7 @@ def add(args, config, basepath, workspace): raise DevtoolError('Command \'%s\' did not create any recipe file:\n%s' % (e.command, e.stdout)) attic_recipe = os.path.join(config.workspace_path, 'attic', recipename, os.path.basename(recipefile)) if os.path.exists(attic_recipe): - logger.warn('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) + logger.warning('A modified recipe from a previous invocation exists in %s - you may wish to move this over the top of the new recipe if you had changes in it that you want to continue with' % attic_recipe) finally: if tmpsrcdir and os.path.exists(tmpsrcdir): shutil.rmtree(tmpsrcdir) @@ -295,7 +295,7 @@ def add(args, config, basepath, workspace): with open(layerconf_file, 'a') as f: f.write('%s = "%s"\n' % (preferred_provider, recipe_name)) else: - logger.warn('Set \'%s\' in order to use the recipe' % preferred_provider) + logger.warning('Set \'%s\' in order to use the recipe' % preferred_provider) break _add_md5(config, recipename, appendfile) @@ -704,7 +704,7 @@ def _check_preserve(config, recipename): if splitline[2] != md5: bb.utils.mkdirhier(preservepath) preservefile = os.path.basename(removefile) - logger.warn('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) + logger.warning('File %s modified since it was written, preserving in %s' % (preservefile, preservepath)) shutil.move(removefile, os.path.join(preservepath, preservefile)) else: os.remove(removefile) @@ -795,7 +795,7 @@ def modify(args, config, basepath, workspace): if branchname.startswith(override_branch_prefix): branches.append(branchname) if branches: - logger.warn('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix)) + logger.warning('SRC_URI is conditionally overridden in this recipe, thus several %s* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the %s branch first, then checkout and rebase each %s* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)' % (override_branch_prefix, args.branch, override_branch_prefix)) branches.insert(0, args.branch) seen_patches = [] for branch in branches: @@ -1720,7 +1720,7 @@ def update_recipe(args, config, basepath, workspace): if updated: rf = rd.getVar('FILE') if rf.startswith(config.workspace_path): - logger.warn('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf) + logger.warning('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf) finally: tinfoil.shutdown() @@ -1803,7 +1803,7 @@ def _reset(recipes, no_clean, config, basepath, workspace): if os.path.exists(origdir): for root, dirs, files in os.walk(origdir): for fn in files: - logger.warn('Preserving %s in %s' % (fn, preservepath)) + logger.warning('Preserving %s in %s' % (fn, preservepath)) _move_file(os.path.join(origdir, fn), os.path.join(preservepath, fn)) for dn in dirs: diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index c3fd866ef6..d652f334bb 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -264,7 +264,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee if no_patch: patches = oe.recipeutils.get_recipe_patches(crd) if patches: - logger.warn('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) + logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) else: __run('git checkout devtool-patched -b %s' % branch) skiptag = False @@ -273,9 +273,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee except bb.process.ExecutionError as e: skiptag = True if 'conflict' in e.stdout: - logger.warn('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) + logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) else: - logger.warn('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) + logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) if not skiptag: if uri.startswith('git://'): suffix = 'new' diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 69c8bb77a0..3f2c134ad5 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -238,7 +238,7 @@ def appendfile(args): if stdout: logger.debug('file command output: %s' % stdout.rstrip()) if ('executable' in stdout and not 'shell script' in stdout) or 'shared object' in stdout: - logger.warn('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.') + logger.warning('This file looks like it is a binary or otherwise the output of compilation. If it is, you should consider building it properly instead of substituting a binary file directly.') if args.recipe: recipes = {args.targetpath: [args.recipe],} @@ -275,7 +275,7 @@ def appendfile(args): if selectpn: logger.debug('Selecting recipe %s for file %s' % (selectpn, args.targetpath)) if postinst_pns: - logger.warn('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns))) + logger.warning('%s be modified by postinstall scripts for the following recipes:\n %s\nThis may or may not be an issue depending on what modifications these postinstall scripts make.' % (args.targetpath, '\n '.join(postinst_pns))) rd = _parse_recipe(selectpn, tinfoil) if not rd: # Error message already shown @@ -286,12 +286,12 @@ def appendfile(args): sourcetype, sourcepath = sourcefile.split('://', 1) logger.debug('Original source file is %s (%s)' % (sourcepath, sourcetype)) if sourcetype == 'patch': - logger.warn('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath)) + logger.warning('File %s is added by the patch %s - you may need to remove or replace this patch in order to replace the file.' % (args.targetpath, sourcepath)) sourcepath = None else: logger.debug('Unable to determine source file, proceeding anyway') if modpatches: - logger.warn('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches))) + logger.warning('File %s is modified by the following patches:\n %s' % (args.targetpath, '\n '.join(modpatches))) if instelements and sourcepath: install = None @@ -343,7 +343,7 @@ def appendsrc(args, files, rd, extralines=None): if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'): srcdir = os.path.join(workdir, 'git') if not bb.data.inherits_class('kernel-yocto', rd): - logger.warn('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') + logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git') src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir) src_destdir = os.path.normpath(src_destdir) @@ -357,9 +357,9 @@ def appendsrc(args, files, rd, extralines=None): if simple_str in simplified: existing = simplified[simple_str] if source_uri != existing: - logger.warn('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) + logger.warning('{0!r} is already in SRC_URI, with different parameters: {1!r}, not adding'.format(source_uri, existing)) else: - logger.warn('{0!r} is already in SRC_URI, not adding'.format(source_uri)) + logger.warning('{0!r} is already in SRC_URI, not adding'.format(source_uri)) else: extralines.append('SRC_URI += {0}'.format(source_uri)) copyfiles[newfile] = srcfile diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index a3710285bb..1810c70ae2 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -98,7 +98,7 @@ class RecipeHandler(object): break except IOError as ioe: if ioe.errno == 2: - logger.warn('unable to find a pkgdata file for package %s' % pkg) + logger.warning('unable to find a pkgdata file for package %s' % pkg) else: raise @@ -437,7 +437,7 @@ def create_recipe(args): if scriptutils.is_src_url(source): # Warn about github archive URLs if re.match('https?://github.com/[^/]+/[^/]+/archive/.+(\.tar\..*|\.zip)$', source): - logger.warn('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') + logger.warning('github archive files are not guaranteed to be stable and may be re-generated over time. If the latter occurs, the checksums will likely change and the recipe will fail at do_fetch. It is recommended that you point to an actual commit or tag in the repository instead (using the repository URL in conjunction with the -S/--srcrev option).') # Fetch a URL fetchuri = reformat_git_uri(urldefrag(source)[0]) if args.binary: diff --git a/scripts/lib/recipetool/create_kmod.py b/scripts/lib/recipetool/create_kmod.py index 4569b53c80..3982537a4e 100644 --- a/scripts/lib/recipetool/create_kmod.py +++ b/scripts/lib/recipetool/create_kmod.py @@ -141,7 +141,7 @@ class KernelModuleRecipeHandler(RecipeHandler): warnmsg = 'Unable to find means of passing kernel path into install makefile - if kernel path is hardcoded you will need to patch the makefile' if warnmsg: warnmsg += '. Note that the variable KERNEL_SRC will be passed in as the kernel source path.' - logger.warn(warnmsg) + logger.warning(warnmsg) lines_after.append('# %s' % warnmsg) return True diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py index bb42a5ca5c..03667887fc 100644 --- a/scripts/lib/recipetool/create_npm.py +++ b/scripts/lib/recipetool/create_npm.py @@ -90,7 +90,7 @@ class NpmRecipeHandler(RecipeHandler): runenv = dict(os.environ, PATH=d.getVar('PATH')) bb.process.run('npm shrinkwrap', cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) except bb.process.ExecutionError as e: - logger.warn('npm shrinkwrap failed:\n%s' % e.stdout) + logger.warning('npm shrinkwrap failed:\n%s' % e.stdout) return tmpfile = os.path.join(localfilesdir, 'npm-shrinkwrap.json') @@ -107,12 +107,12 @@ class NpmRecipeHandler(RecipeHandler): cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) relockbin = os.path.join(NpmRecipeHandler.lockdownpath, 'node_modules', 'lockdown', 'relock.js') if not os.path.exists(relockbin): - logger.warn('Could not find relock.js within lockdown directory; skipping lockdown') + logger.warning('Could not find relock.js within lockdown directory; skipping lockdown') return try: bb.process.run('node %s' % relockbin, cwd=srctree, stderr=subprocess.STDOUT, env=runenv, shell=True) except bb.process.ExecutionError as e: - logger.warn('lockdown-relock failed:\n%s' % e.stdout) + logger.warning('lockdown-relock failed:\n%s' % e.stdout) return tmpfile = os.path.join(localfilesdir, 'lockdown.json') diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py index decce83fac..76707b4c91 100644 --- a/scripts/lib/recipetool/newappend.py +++ b/scripts/lib/recipetool/newappend.py @@ -58,11 +58,11 @@ def newappend(args): return 1 if not path_ok: - logger.warn('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path)) + logger.warning('Unable to determine correct subdirectory path for bbappend file - check that what %s adds to BBFILES also matches .bbappend files. Using %s for now, but until you fix this the bbappend will not be applied.', os.path.join(args.destlayer, 'conf', 'layer.conf'), os.path.dirname(append_path)) layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS').split()] if not os.path.abspath(args.destlayer) in layerdirs: - logger.warn('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active') + logger.warning('Specified layer is not currently enabled in bblayers.conf, you will need to add it before this bbappend will be active') if not os.path.exists(append_path): bb.utils.mkdirhier(os.path.dirname(append_path)) diff --git a/scripts/lib/resulttool/__init__.py b/scripts/lib/resulttool/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/scripts/lib/resulttool/__init__.py diff --git a/scripts/lib/resulttool/manualexecution.py b/scripts/lib/resulttool/manualexecution.py new file mode 100755 index 0000000000..c94f98126b --- /dev/null +++ b/scripts/lib/resulttool/manualexecution.py @@ -0,0 +1,127 @@ +# test case management tool - manual execution from testopia test cases +# +# Copyright (c) 2018, Intel Corporation. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import argparse +import json +import os +import sys +import datetime +import re +from oeqa.core.runner import OETestResultJSONHelper + + +def load_json_file(file): + with open(file, "r") as f: + return json.load(f) + +class ManualTestRunner(object): + + def _get_testcases(self, file): + self.jdata = load_json_file(file) + self.test_module = self.jdata[0]['test']['@alias'].split('.', 2)[0] + + def _get_input(self, config): + while True: + output = input('{} = '.format(config)) + if re.match('^[a-z0-9-.]+$', output): + break + print('Only lowercase alphanumeric, hyphen and dot are allowed. Please try again') + return output + + def _create_config(self): + from oeqa.utils.metadata import get_layers + from oeqa.utils.commands import get_bb_var + from resulttool.resultutils import store_map + + layers = get_layers(get_bb_var('BBLAYERS')) + self.configuration = {} + self.configuration['LAYERS'] = layers + current_datetime = datetime.datetime.now() + self.starttime = current_datetime.strftime('%Y%m%d%H%M%S') + self.configuration['STARTTIME'] = self.starttime + self.configuration['TEST_TYPE'] = 'manual' + self.configuration['TEST_MODULE'] = self.test_module + + extra_config = set(store_map['manual']) - set(self.configuration) + for config in sorted(extra_config): + print('---------------------------------------------') + print('This is configuration #%s. Please provide configuration value(use "None" if not applicable).' % config) + print('---------------------------------------------') + value_conf = self._get_input('Configuration Value') + print('---------------------------------------------\n') + self.configuration[config] = value_conf + + def _create_result_id(self): + self.result_id = 'manual_%s_%s' % (self.test_module, self.starttime) + + def _execute_test_steps(self, test): + test_result = {} + print('------------------------------------------------------------------------') + print('Executing test case: %s' % test['test']['@alias']) + print('------------------------------------------------------------------------') + print('You have total %s test steps to be executed.' % len(test['test']['execution'])) + print('------------------------------------------------------------------------\n') + for step, _ in sorted(test['test']['execution'].items(), key=lambda x: int(x[0])): + print('Step %s: %s' % (step, test['test']['execution'][step]['action'])) + expected_output = test['test']['execution'][step]['expected_results'] + if expected_output: + print('Expected output: %s' % expected_output) + while True: + done = input('\nPlease provide test results: (P)assed/(F)ailed/(B)locked/(S)kipped? \n').lower() + result_types = {'p':'PASSED', + 'f':'FAILED', + 'b':'BLOCKED', + 's':'SKIPPED'} + if done in result_types: + for r in result_types: + if done == r: + res = result_types[r] + if res == 'FAILED': + log_input = input('\nPlease enter the error and the description of the log: (Ex:log:211 Error Bitbake)\n') + test_result.update({test['test']['@alias']: {'status': '%s' % res, 'log': '%s' % log_input}}) + else: + test_result.update({test['test']['@alias']: {'status': '%s' % res}}) + break + print('Invalid input!') + return test_result + + def _create_write_dir(self): + basepath = os.environ['BUILDDIR'] + self.write_dir = basepath + '/tmp/log/manual/' + + def run_test(self, file): + self._get_testcases(file) + self._create_config() + self._create_result_id() + self._create_write_dir() + test_results = {} + print('\nTotal number of test cases in this test suite: %s\n' % len(self.jdata)) + for t in self.jdata: + test_result = self._execute_test_steps(t) + test_results.update(test_result) + return self.configuration, self.result_id, self.write_dir, test_results + +def manualexecution(args, logger): + testrunner = ManualTestRunner() + get_configuration, get_result_id, get_write_dir, get_test_results = testrunner.run_test(args.file) + resultjsonhelper = OETestResultJSONHelper() + resultjsonhelper.dump_testresult_file(get_write_dir, get_configuration, get_result_id, get_test_results) + return 0 + +def register_commands(subparsers): + """Register subcommands from this plugin""" + parser_build = subparsers.add_parser('manualexecution', help='helper script for results populating during manual test execution.', + description='helper script for results populating during manual test execution. You can find manual test case JSON file in meta/lib/oeqa/manual/', + group='manualexecution') + parser_build.set_defaults(func=manualexecution) + parser_build.add_argument('file', help='specify path to manual test case JSON file.Note: Please use \"\" to encapsulate the file path.') diff --git a/scripts/lib/resulttool/merge.py b/scripts/lib/resulttool/merge.py new file mode 100644 index 0000000000..3e4b7a38ad --- /dev/null +++ b/scripts/lib/resulttool/merge.py @@ -0,0 +1,42 @@ +# resulttool - merge multiple testresults.json files into a file or directory +# +# Copyright (c) 2019, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import os +import json +import resulttool.resultutils as resultutils + +def merge(args, logger): + if os.path.isdir(args.target_results): + results = resultutils.load_resultsdata(args.target_results, configmap=resultutils.store_map) + resultutils.append_resultsdata(results, args.base_results, configmap=resultutils.store_map) + resultutils.save_resultsdata(results, args.target_results) + else: + results = resultutils.load_resultsdata(args.base_results, configmap=resultutils.flatten_map) + if os.path.exists(args.target_results): + resultutils.append_resultsdata(results, args.target_results, configmap=resultutils.flatten_map) + resultutils.save_resultsdata(results, os.path.dirname(args.target_results), fn=os.path.basename(args.target_results)) + + return 0 + +def register_commands(subparsers): + """Register subcommands from this plugin""" + parser_build = subparsers.add_parser('merge', help='merge test result files/directories', + description='merge the results from multiple files/directories into the target file or directory', + group='setup') + parser_build.set_defaults(func=merge) + parser_build.add_argument('base_results', + help='the results file/directory to import') + parser_build.add_argument('target_results', + help='the target file or directory to merge the base_results with') + diff --git a/scripts/lib/resulttool/regression.py b/scripts/lib/resulttool/regression.py new file mode 100644 index 0000000000..bdf531dedf --- /dev/null +++ b/scripts/lib/resulttool/regression.py @@ -0,0 +1,192 @@ +# resulttool - regression analysis +# +# Copyright (c) 2019, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import resulttool.resultutils as resultutils +import json + +from oeqa.utils.git import GitRepo +import oeqa.utils.gitarchive as gitarchive + +def compare_result(logger, base_name, target_name, base_result, target_result): + base_result = base_result.get('result') + target_result = target_result.get('result') + result = {} + if base_result and target_result: + for k in base_result: + base_testcase = base_result[k] + base_status = base_testcase.get('status') + if base_status: + target_testcase = target_result.get(k, {}) + target_status = target_testcase.get('status') + if base_status != target_status: + result[k] = {'base': base_status, 'target': target_status} + else: + logger.error('Failed to retrieved base test case status: %s' % k) + if result: + resultstring = "Regression: %s\n %s\n" % (base_name, target_name) + for k in sorted(result): + resultstring += ' %s: %s -> %s\n' % (k, result[k]['base'], result[k]['target']) + else: + resultstring = "Match: %s\n %s" % (base_name, target_name) + return result, resultstring + +def get_results(logger, source): + return resultutils.load_resultsdata(source, configmap=resultutils.regression_map) + +def regression(args, logger): + base_results = get_results(logger, args.base_result) + target_results = get_results(logger, args.target_result) + + regression_common(args, logger, base_results, target_results) + +def regression_common(args, logger, base_results, target_results): + if args.base_result_id: + base_results = resultutils.filter_resultsdata(base_results, args.base_result_id) + if args.target_result_id: + target_results = resultutils.filter_resultsdata(target_results, args.target_result_id) + + matches = [] + regressions = [] + notfound = [] + + for a in base_results: + if a in target_results: + base = list(base_results[a].keys()) + target = list(target_results[a].keys()) + # We may have multiple base/targets which are for different configurations. Start by + # removing any pairs which match + for c in base.copy(): + for b in target.copy(): + res, resstr = compare_result(logger, c, b, base_results[a][c], target_results[a][b]) + if not res: + matches.append(resstr) + base.remove(c) + target.remove(b) + break + # Should only now see regressions, we may not be able to match multiple pairs directly + for c in base: + for b in target: + res, resstr = compare_result(logger, c, b, base_results[a][c], target_results[a][b]) + if res: + regressions.append(resstr) + else: + notfound.append("%s not found in target" % a) + print("\n".join(sorted(matches))) + print("\n".join(sorted(regressions))) + print("\n".join(sorted(notfound))) + + return 0 + +def regression_git(args, logger): + base_results = {} + target_results = {} + + tag_name = "{branch}/{commit_number}-g{commit}/{tag_number}" + repo = GitRepo(args.repo) + + revs = gitarchive.get_test_revs(logger, repo, tag_name, branch=args.branch) + + if args.branch2: + revs2 = gitarchive.get_test_revs(logger, repo, tag_name, branch=args.branch2) + if not len(revs2): + logger.error("No revisions found to compare against") + return 1 + if not len(revs): + logger.error("No revision to report on found") + return 1 + else: + if len(revs) < 2: + logger.error("Only %d tester revisions found, unable to generate report" % len(revs)) + return 1 + + # Pick revisions + if args.commit: + if args.commit_number: + logger.warning("Ignoring --commit-number as --commit was specified") + index1 = gitarchive.rev_find(revs, 'commit', args.commit) + elif args.commit_number: + index1 = gitarchive.rev_find(revs, 'commit_number', args.commit_number) + else: + index1 = len(revs) - 1 + + if args.branch2: + revs2.append(revs[index1]) + index1 = len(revs2) - 1 + revs = revs2 + + if args.commit2: + if args.commit_number2: + logger.warning("Ignoring --commit-number2 as --commit2 was specified") + index2 = gitarchive.rev_find(revs, 'commit', args.commit2) + elif args.commit_number2: + index2 = gitarchive.rev_find(revs, 'commit_number', args.commit_number2) + else: + if index1 > 0: + index2 = index1 - 1 + # Find the closest matching commit number for comparision + # In future we could check the commit is a common ancestor and + # continue back if not but this good enough for now + while index2 > 0 and revs[index2].commit_number > revs[index1].commit_number: + index2 = index2 - 1 + else: + logger.error("Unable to determine the other commit, use " + "--commit2 or --commit-number2 to specify it") + return 1 + + logger.info("Comparing:\n%s\nto\n%s\n" % (revs[index1], revs[index2])) + + base_results = resultutils.git_get_result(repo, revs[index1][2]) + target_results = resultutils.git_get_result(repo, revs[index2][2]) + + regression_common(args, logger, base_results, target_results) + + return 0 + +def register_commands(subparsers): + """Register subcommands from this plugin""" + + parser_build = subparsers.add_parser('regression', help='regression file/directory analysis', + description='regression analysis comparing the base set of results to the target results', + group='analysis') + parser_build.set_defaults(func=regression) + parser_build.add_argument('base_result', + help='base result file/directory for the comparison') + parser_build.add_argument('target_result', + help='target result file/directory to compare with') + parser_build.add_argument('-b', '--base-result-id', default='', + help='(optional) filter the base results to this result ID') + parser_build.add_argument('-t', '--target-result-id', default='', + help='(optional) filter the target results to this result ID') + + parser_build = subparsers.add_parser('regression-git', help='regression git analysis', + description='regression analysis comparing base result set to target ' + 'result set', + group='analysis') + parser_build.set_defaults(func=regression_git) + parser_build.add_argument('repo', + help='the git repository containing the data') + parser_build.add_argument('-b', '--base-result-id', default='', + help='(optional) default select regression based on configurations unless base result ' + 'id was provided') + parser_build.add_argument('-t', '--target-result-id', default='', + help='(optional) default select regression based on configurations unless target result ' + 'id was provided') + + parser_build.add_argument('--branch', '-B', default='master', help="Branch to find commit in") + parser_build.add_argument('--branch2', help="Branch to find comparision revisions in") + parser_build.add_argument('--commit', help="Revision to search for") + parser_build.add_argument('--commit-number', help="Revision number to search for, redundant if --commit is specified") + parser_build.add_argument('--commit2', help="Revision to compare with") + parser_build.add_argument('--commit-number2', help="Revision number to compare with, redundant if --commit2 is specified") + diff --git a/scripts/lib/resulttool/report.py b/scripts/lib/resulttool/report.py new file mode 100644 index 0000000000..90086209e3 --- /dev/null +++ b/scripts/lib/resulttool/report.py @@ -0,0 +1,150 @@ +# test result tool - report text based test results +# +# Copyright (c) 2019, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import os +import glob +import json +import resulttool.resultutils as resultutils +from oeqa.utils.git import GitRepo +import oeqa.utils.gitarchive as gitarchive + + +class ResultsTextReport(object): + def __init__(self): + self.ptests = {} + self.result_types = {'passed': ['PASSED', 'passed'], + 'failed': ['FAILED', 'failed', 'ERROR', 'error', 'UNKNOWN'], + 'skipped': ['SKIPPED', 'skipped']} + + + def handle_ptest_result(self, k, status, result): + if k == 'ptestresult.sections': + # Ensure tests without any test results still show up on the report + for suite in result['ptestresult.sections']: + if suite not in self.ptests: + self.ptests[suite] = {'passed': 0, 'failed': 0, 'skipped': 0, 'duration' : '-', 'failed_testcases': []} + if 'duration' in result['ptestresult.sections'][suite]: + self.ptests[suite]['duration'] = result['ptestresult.sections'][suite]['duration'] + if 'timeout' in result['ptestresult.sections'][suite]: + self.ptests[suite]['duration'] += " T" + return + try: + _, suite, test = k.split(".", 2) + except ValueError: + return + # Handle 'glib-2.0' + if 'ptestresult.sections' in result and suite not in result['ptestresult.sections']: + try: + _, suite, suite1, test = k.split(".", 3) + if suite + "." + suite1 in result['ptestresult.sections']: + suite = suite + "." + suite1 + except ValueError: + pass + if suite not in self.ptests: + self.ptests[suite] = {'passed': 0, 'failed': 0, 'skipped': 0, 'duration' : '-', 'failed_testcases': []} + for tk in self.result_types: + if status in self.result_types[tk]: + self.ptests[suite][tk] += 1 + + def get_aggregated_test_result(self, logger, testresult): + test_count_report = {'passed': 0, 'failed': 0, 'skipped': 0, 'failed_testcases': []} + result = testresult.get('result', []) + for k in result: + test_status = result[k].get('status', []) + for tk in self.result_types: + if test_status in self.result_types[tk]: + test_count_report[tk] += 1 + if test_status in self.result_types['failed']: + test_count_report['failed_testcases'].append(k) + if k.startswith("ptestresult."): + self.handle_ptest_result(k, test_status, result) + return test_count_report + + def print_test_report(self, template_file_name, test_count_reports): + from jinja2 import Environment, FileSystemLoader + script_path = os.path.dirname(os.path.realpath(__file__)) + file_loader = FileSystemLoader(script_path + '/template') + env = Environment(loader=file_loader, trim_blocks=True) + template = env.get_template(template_file_name) + havefailed = False + haveptest = bool(self.ptests) + reportvalues = [] + cols = ['passed', 'failed', 'skipped'] + maxlen = {'passed' : 0, 'failed' : 0, 'skipped' : 0, 'result_id': 0, 'testseries' : 0, 'ptest' : 0 } + for line in test_count_reports: + total_tested = line['passed'] + line['failed'] + line['skipped'] + vals = {} + vals['result_id'] = line['result_id'] + vals['testseries'] = line['testseries'] + vals['sort'] = line['testseries'] + "_" + line['result_id'] + vals['failed_testcases'] = line['failed_testcases'] + for k in cols: + vals[k] = "%d (%s%%)" % (line[k], format(line[k] / total_tested * 100, '.0f')) + for k in maxlen: + if k in vals and len(vals[k]) > maxlen[k]: + maxlen[k] = len(vals[k]) + reportvalues.append(vals) + if line['failed_testcases']: + havefailed = True + for ptest in self.ptests: + if len(ptest) > maxlen['ptest']: + maxlen['ptest'] = len(ptest) + output = template.render(reportvalues=reportvalues, + havefailed=havefailed, + haveptest=haveptest, + ptests=self.ptests, + maxlen=maxlen) + print(output) + + def view_test_report(self, logger, source_dir, branch, commit, tag): + test_count_reports = [] + if commit: + if tag: + logger.warning("Ignoring --tag as --commit was specified") + tag_name = "{branch}/{commit_number}-g{commit}/{tag_number}" + repo = GitRepo(source_dir) + revs = gitarchive.get_test_revs(logger, repo, tag_name, branch=branch) + rev_index = gitarchive.rev_find(revs, 'commit', commit) + testresults = resultutils.git_get_result(repo, revs[rev_index][2]) + elif tag: + repo = GitRepo(source_dir) + testresults = resultutils.git_get_result(repo, [tag]) + else: + testresults = resultutils.load_resultsdata(source_dir) + for testsuite in testresults: + for resultid in testresults[testsuite]: + result = testresults[testsuite][resultid] + test_count_report = self.get_aggregated_test_result(logger, result) + test_count_report['testseries'] = result['configuration']['TESTSERIES'] + test_count_report['result_id'] = resultid + test_count_reports.append(test_count_report) + self.print_test_report('test_report_full_text.txt', test_count_reports) + +def report(args, logger): + report = ResultsTextReport() + report.view_test_report(logger, args.source_dir, args.branch, args.commit, args.tag) + return 0 + +def register_commands(subparsers): + """Register subcommands from this plugin""" + parser_build = subparsers.add_parser('report', help='summarise test results', + description='print a text-based summary of the test results', + group='analysis') + parser_build.set_defaults(func=report) + parser_build.add_argument('source_dir', + help='source file/directory that contain the test result files to summarise') + parser_build.add_argument('--branch', '-B', default='master', help="Branch to find commit in") + parser_build.add_argument('--commit', help="Revision to report") + parser_build.add_argument('-t', '--tag', default='', + help='source_dir is a git repository, report on the tag specified from that repository') diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py new file mode 100644 index 0000000000..ad40ac8499 --- /dev/null +++ b/scripts/lib/resulttool/resultutils.py @@ -0,0 +1,154 @@ +# resulttool - common library/utility functions +# +# Copyright (c) 2019, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import os +import json +import scriptpath +import copy +scriptpath.add_oe_lib_path() + +flatten_map = { + "oeselftest": [], + "runtime": [], + "sdk": [], + "sdkext": [], + "manual": [] +} +regression_map = { + "oeselftest": ['TEST_TYPE', 'MACHINE'], + "runtime": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE', 'IMAGE_PKGTYPE', 'DISTRO'], + "sdk": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE', 'SDKMACHINE'], + "sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE', 'SDKMACHINE'], + "manual": ['TEST_TYPE', 'TEST_MODULE', 'IMAGE_BASENAME', 'MACHINE'] +} +store_map = { + "oeselftest": ['TEST_TYPE'], + "runtime": ['TEST_TYPE', 'DISTRO', 'MACHINE', 'IMAGE_BASENAME'], + "sdk": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'], + "sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'], + "manual": ['TEST_TYPE', 'TEST_MODULE', 'MACHINE', 'IMAGE_BASENAME'] +} + +# +# Load the json file and append the results data into the provided results dict +# +def append_resultsdata(results, f, configmap=store_map): + if type(f) is str: + with open(f, "r") as filedata: + data = json.load(filedata) + else: + data = f + for res in data: + if "configuration" not in data[res] or "result" not in data[res]: + raise ValueError("Test results data without configuration or result section?") + if "TESTSERIES" not in data[res]["configuration"]: + data[res]["configuration"]["TESTSERIES"] = os.path.basename(os.path.dirname(f)) + testtype = data[res]["configuration"].get("TEST_TYPE") + if testtype not in configmap: + raise ValueError("Unknown test type %s" % testtype) + configvars = configmap[testtype] + testpath = "/".join(data[res]["configuration"].get(i) for i in configmap[testtype]) + if testpath not in results: + results[testpath] = {} + results[testpath][res] = data[res] + +# +# Walk a directory and find/load results data +# or load directly from a file +# +def load_resultsdata(source, configmap=store_map): + results = {} + if os.path.isfile(source): + append_resultsdata(results, source, configmap) + return results + for root, dirs, files in os.walk(source): + for name in files: + f = os.path.join(root, name) + if name == "testresults.json": + append_resultsdata(results, f, configmap) + return results + +def filter_resultsdata(results, resultid): + newresults = {} + for r in results: + for i in results[r]: + if i == resultsid: + newresults[r] = {} + newresults[r][i] = results[r][i] + return newresults + +def strip_ptestresults(results): + newresults = copy.deepcopy(results) + #for a in newresults2: + # newresults = newresults2[a] + for res in newresults: + if 'result' not in newresults[res]: + continue + if 'ptestresult.rawlogs' in newresults[res]['result']: + del newresults[res]['result']['ptestresult.rawlogs'] + if 'ptestresult.sections' in newresults[res]['result']: + for i in newresults[res]['result']['ptestresult.sections']: + if 'log' in newresults[res]['result']['ptestresult.sections'][i]: + del newresults[res]['result']['ptestresult.sections'][i]['log'] + return newresults + +def save_resultsdata(results, destdir, fn="testresults.json", ptestjson=False, ptestlogs=False): + for res in results: + if res: + dst = destdir + "/" + res + "/" + fn + else: + dst = destdir + "/" + fn + os.makedirs(os.path.dirname(dst), exist_ok=True) + resultsout = results[res] + if not ptestjson: + resultsout = strip_ptestresults(results[res]) + with open(dst, 'w') as f: + f.write(json.dumps(resultsout, sort_keys=True, indent=4)) + for res2 in results[res]: + if ptestlogs and 'result' in results[res][res2]: + if 'ptestresult.rawlogs' in results[res][res2]['result']: + with open(dst.replace(fn, "ptest-raw.log"), "w+") as f: + f.write(results[res][res2]['result']['ptestresult.rawlogs']['log']) + if 'ptestresult.sections' in results[res][res2]['result']: + for i in results[res][res2]['result']['ptestresult.sections']: + if 'log' in results[res][res2]['result']['ptestresult.sections'][i]: + with open(dst.replace(fn, "ptest-%s.log" % i), "w+") as f: + f.write(results[res][res2]['result']['ptestresult.sections'][i]['log']) + +def git_get_result(repo, tags): + git_objs = [] + for tag in tags: + files = repo.run_cmd(['ls-tree', "--name-only", "-r", tag]).splitlines() + git_objs.extend([tag + ':' + f for f in files if f.endswith("testresults.json")]) + + def parse_json_stream(data): + """Parse multiple concatenated JSON objects""" + objs = [] + json_d = "" + for line in data.splitlines(): + if line == '}{': + json_d += '}' + objs.append(json.loads(json_d)) + json_d = '{' + else: + json_d += line + objs.append(json.loads(json_d)) + return objs + + # Optimize by reading all data with one git command + results = {} + for obj in parse_json_stream(repo.run_cmd(['show'] + git_objs + ['--'])): + append_resultsdata(results, obj) + + return results diff --git a/scripts/lib/resulttool/store.py b/scripts/lib/resulttool/store.py new file mode 100644 index 0000000000..e4a0807528 --- /dev/null +++ b/scripts/lib/resulttool/store.py @@ -0,0 +1,102 @@ +# resulttool - store test results +# +# Copyright (c) 2019, Intel Corporation. +# Copyright (c) 2019, Linux Foundation +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +import tempfile +import os +import subprocess +import json +import shutil +import scriptpath +scriptpath.add_bitbake_lib_path() +scriptpath.add_oe_lib_path() +import resulttool.resultutils as resultutils +import oeqa.utils.gitarchive as gitarchive + + +def store(args, logger): + tempdir = tempfile.mkdtemp(prefix='testresults.') + try: + results = {} + logger.info('Reading files from %s' % args.source) + if os.path.isfile(args.source): + resultutils.append_resultsdata(results, args.source) + else: + for root, dirs, files in os.walk(args.source): + for name in files: + f = os.path.join(root, name) + if name == "testresults.json": + resultutils.append_resultsdata(results, f) + elif args.all: + dst = f.replace(args.source, tempdir + "/") + os.makedirs(os.path.dirname(dst), exist_ok=True) + shutil.copyfile(f, dst) + + revisions = {} + + if not results and not args.all: + if args.allow_empty: + logger.info("No results found to store") + return 0 + logger.error("No results found to store") + return 1 + + # Find the branch/commit/commit_count and ensure they all match + for suite in results: + for result in results[suite]: + config = results[suite][result]['configuration']['LAYERS']['meta'] + revision = (config['commit'], config['branch'], str(config['commit_count'])) + if revision not in revisions: + revisions[revision] = {} + if suite not in revisions[revision]: + revisions[revision][suite] = {} + revisions[revision][suite][result] = results[suite][result] + + logger.info("Found %d revisions to store" % len(revisions)) + + for r in revisions: + results = revisions[r] + keywords = {'commit': r[0], 'branch': r[1], "commit_count": r[2]} + subprocess.check_call(["find", tempdir, "!", "-path", "./.git/*", "-delete"]) + resultutils.save_resultsdata(results, tempdir, ptestlogs=True) + + logger.info('Storing test result into git repository %s' % args.git_dir) + + gitarchive.gitarchive(tempdir, args.git_dir, False, False, + "Results of {branch}:{commit}", "branch: {branch}\ncommit: {commit}", "{branch}", + False, "{branch}/{commit_count}-g{commit}/{tag_number}", + 'Test run #{tag_number} of {branch}:{commit}', '', + [], [], False, keywords, logger) + + finally: + subprocess.check_call(["rm", "-rf", tempdir]) + + return 0 + +def register_commands(subparsers): + """Register subcommands from this plugin""" + parser_build = subparsers.add_parser('store', help='store test results into a git repository', + description='takes a results file or directory of results files and stores ' + 'them into the destination git repository, splitting out the results ' + 'files as configured', + group='setup') + parser_build.set_defaults(func=store) + parser_build.add_argument('source', + help='source file or directory that contain the test result files to be stored') + parser_build.add_argument('git_dir', + help='the location of the git repository to store the results in') + parser_build.add_argument('-a', '--all', action='store_true', + help='include all files, not just testresults.json files') + parser_build.add_argument('-e', '--allow-empty', action='store_true', + help='don\'t error if no results to store are found') + diff --git a/scripts/lib/resulttool/template/test_report_full_text.txt b/scripts/lib/resulttool/template/test_report_full_text.txt new file mode 100644 index 0000000000..590f35c7dd --- /dev/null +++ b/scripts/lib/resulttool/template/test_report_full_text.txt @@ -0,0 +1,44 @@ +============================================================================================================== +Test Result Status Summary (Counts/Percentages sorted by testseries, ID) +============================================================================================================== +-------------------------------------------------------------------------------------------------------------- +{{ 'Test Series'.ljust(maxlen['testseries']) }} | {{ 'ID'.ljust(maxlen['result_id']) }} | {{ 'Passed'.ljust(maxlen['passed']) }} | {{ 'Failed'.ljust(maxlen['failed']) }} | {{ 'Skipped'.ljust(maxlen['skipped']) }} +-------------------------------------------------------------------------------------------------------------- +{% for report in reportvalues |sort(attribute='sort') %} +{{ report.testseries.ljust(maxlen['testseries']) }} | {{ report.result_id.ljust(maxlen['result_id']) }} | {{ (report.passed|string).ljust(maxlen['passed']) }} | {{ (report.failed|string).ljust(maxlen['failed']) }} | {{ (report.skipped|string).ljust(maxlen['skipped']) }} +{% endfor %} +-------------------------------------------------------------------------------------------------------------- + +{% if haveptest %} +============================================================================================================== +PTest Result Summary +============================================================================================================== +-------------------------------------------------------------------------------------------------------------- +{{ 'Recipe'.ljust(maxlen['ptest']) }} | {{ 'Passed'.ljust(maxlen['passed']) }} | {{ 'Failed'.ljust(maxlen['failed']) }} | {{ 'Skipped'.ljust(maxlen['skipped']) }} | {{ 'Time(s)'.ljust(10) }} +-------------------------------------------------------------------------------------------------------------- +{% for ptest in ptests |sort %} +{{ ptest.ljust(maxlen['ptest']) }} | {{ (ptests[ptest]['passed']|string).ljust(maxlen['passed']) }} | {{ (ptests[ptest]['failed']|string).ljust(maxlen['failed']) }} | {{ (ptests[ptest]['skipped']|string).ljust(maxlen['skipped']) }} | {{ (ptests[ptest]['duration']|string) }} +{% endfor %} +-------------------------------------------------------------------------------------------------------------- + +{% else %} +There was no ptest data +{% endif %} + +============================================================================================================== +Failed test cases (sorted by testseries, ID) +============================================================================================================== +{% if havefailed %} +-------------------------------------------------------------------------------------------------------------- +{% for report in reportvalues |sort(attribute='sort') %} +{% if report.failed_testcases %} +testseries | result_id : {{ report.testseries }} | {{ report.result_id }} +{% for testcase in report.failed_testcases %} + {{ testcase }} +{% endfor %} +{% endif %} +{% endfor %} +-------------------------------------------------------------------------------------------------------------- +{% else %} +There were no test failures +{% endif %} diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index f0c5ff0aaf..acaf9583c5 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -191,7 +191,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, if not os.path.exists(options.outdir): os.makedirs(options.outdir) - pname = 'direct' + pname = options.imager plugin_class = PluginMgr.get_plugins('imager').get(pname) if not plugin_class: raise WicError('Unknown plugin: %s' % pname) @@ -245,9 +245,16 @@ class Disk: self._ptable_format = None # find parted - self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" + # read paths from $PATH environment variable + # if it fails, use hardcoded paths + pathlist = "/bin:/usr/bin:/usr/sbin:/sbin/" + try: + self.paths = os.environ['PATH'] + ":" + pathlist + except KeyError: + self.paths = pathlist + if native_sysroot: - for path in self.paths.split(':'): + for path in pathlist.split(':'): self.paths = "%s%s:%s" % (native_sysroot, path, self.paths) self.parted = find_executable("parted", self.paths) @@ -266,10 +273,15 @@ class Disk: out = exec_cmd("%s -sm %s unit B print" % (self.parted, self.imagepath)) parttype = namedtuple("Part", "pnum start end size fstype") splitted = out.splitlines() - lsector_size, psector_size, self._ptable_format = splitted[1].split(":")[3:6] + # skip over possible errors in exec_cmd output + try: + idx =splitted.index("BYT;") + except ValueError: + raise WicError("Error getting partition information from %s" % (self.parted)) + lsector_size, psector_size, self._ptable_format = splitted[idx + 1].split(":")[3:6] self._lsector_size = int(lsector_size) self._psector_size = int(psector_size) - for line in splitted[2:]: + for line in splitted[idx + 2:]: pnum, start, end, size, fstype = line.split(':')[:5] partition = parttype(int(pnum), int(start[:-1]), int(end[:-1]), int(size[:-1]), fstype) @@ -326,7 +338,7 @@ class Disk: def copy(self, src, pnum, path): """Copy partition image into wic image.""" if self.partitions[pnum].fstype.startswith('ext'): - cmd = "echo -e 'cd {}\nwrite {} {}' | {} -w {}".\ + cmd = "printf 'cd {}\nwrite {} {}' | {} -w {}".\ format(path, src, os.path.basename(src), self.debugfs, self._get_part_image(pnum)) else: # fat @@ -494,7 +506,7 @@ class Disk: sparse_copy(partfname, target, seek=part['start'] * self._lsector_size) os.unlink(partfname) elif part['type'] != 'f': - logger.warn("skipping partition {}: unsupported fstype {}".format(pnum, fstype)) + logger.warning("skipping partition {}: unsupported fstype {}".format(pnum, fstype)) def wic_ls(args, native_sysroot): """List contents of partitioned image or vfat partition.""" diff --git a/scripts/lib/wic/filemap.py b/scripts/lib/wic/filemap.py index a72fa09ef5..abbf958b8c 100644 --- a/scripts/lib/wic/filemap.py +++ b/scripts/lib/wic/filemap.py @@ -22,6 +22,7 @@ and returns an instance of the class. # * Too many instance attributes (R0902) # pylint: disable=R0902 +import errno import os import struct import array @@ -189,9 +190,9 @@ def _lseek(file_obj, offset, whence): except OSError as err: # The 'lseek' system call returns the ENXIO if there is no data or # hole starting from the specified offset. - if err.errno == os.errno.ENXIO: + if err.errno == errno.ENXIO: return -1 - elif err.errno == os.errno.EINVAL: + elif err.errno == errno.EINVAL: raise ErrorNotSupp("the kernel or file-system does not support " "\"SEEK_HOLE\" and \"SEEK_DATA\"") else: @@ -394,12 +395,12 @@ class FilemapFiemap(_FilemapBase): except IOError as err: # Note, the FIEMAP ioctl is supported by the Linux kernel starting # from version 2.6.28 (year 2008). - if err.errno == os.errno.EOPNOTSUPP: + if err.errno == errno.EOPNOTSUPP: errstr = "FilemapFiemap: the FIEMAP ioctl is not supported " \ "by the file-system" self._log.debug(errstr) raise ErrorNotSupp(errstr) - if err.errno == os.errno.ENOTTY: + if err.errno == errno.ENOTTY: errstr = "FilemapFiemap: the FIEMAP ioctl is not supported " \ "by the kernel" self._log.debug(errstr) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index d599112dd7..9347aa7fcb 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -26,6 +26,7 @@ import logging import os +import re from wic import WicError from wic.engine import get_custom_config @@ -47,10 +48,17 @@ class BootimgPcbiosPlugin(SourcePlugin): """ Check if dirname exists in default bootimg_dir or in STAGING_DIR. """ - for result in (bootimg_dir, get_bitbake_var("STAGING_DATADIR")): + staging_datadir = get_bitbake_var("STAGING_DATADIR") + for result in (bootimg_dir, staging_datadir): if os.path.exists("%s/%s" % (result, dirname)): return result + # STAGING_DATADIR is expanded with MLPREFIX if multilib is enabled + # but dependency syslinux is still populated to original STAGING_DATADIR + nonarch_datadir = re.sub('/[^/]*recipe-sysroot', '/recipe-sysroot', staging_datadir) + if os.path.exists(os.path.join(nonarch_datadir, dirname)): + return nonarch_datadir + raise WicError("Couldn't find correct bootimg_dir, exiting") @classmethod diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report index dc999c45c1..cf1c947aee 100755 --- a/scripts/oe-build-perf-report +++ b/scripts/oe-build-perf-report @@ -37,58 +37,18 @@ from buildstats import BuildStats, diff_buildstats, BSVerDiff scriptpath.add_oe_lib_path() from oeqa.utils.git import GitRepo, GitError +import oeqa.utils.gitarchive as gitarchive # Setup logging logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s") log = logging.getLogger('oe-build-perf-report') - -# Container class for tester revisions -TestedRev = namedtuple('TestedRev', 'commit commit_number tags') - - -def get_test_runs(repo, tag_name, **kwargs): - """Get a sorted list of test runs, matching given pattern""" - # First, get field names from the tag name pattern - field_names = [m.group(1) for m in re.finditer(r'{(\w+)}', tag_name)] - undef_fields = [f for f in field_names if f not in kwargs.keys()] - - # Fields for formatting tag name pattern - str_fields = dict([(f, '*') for f in field_names]) - str_fields.update(kwargs) - - # Get a list of all matching tags - tag_pattern = tag_name.format(**str_fields) - tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines() - log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) - - # Parse undefined fields from tag names - str_fields = dict([(f, r'(?P<{}>[\w\-.()]+)'.format(f)) for f in field_names]) - str_fields['branch'] = r'(?P<branch>[\w\-.()/]+)' - str_fields['commit'] = '(?P<commit>[0-9a-f]{7,40})' - str_fields['commit_number'] = '(?P<commit_number>[0-9]{1,7})' - str_fields['tag_number'] = '(?P<tag_number>[0-9]{1,5})' - # escape parenthesis in fields in order to not messa up the regexp - fixed_fields = dict([(k, v.replace('(', r'\(').replace(')', r'\)')) for k, v in kwargs.items()]) - str_fields.update(fixed_fields) - tag_re = re.compile(tag_name.format(**str_fields)) - - # Parse fields from tags - revs = [] - for tag in tags: - m = tag_re.match(tag) - groups = m.groupdict() - revs.append([groups[f] for f in undef_fields] + [tag]) - - # Return field names and a sorted list of revs - return undef_fields, sorted(revs) - def list_test_revs(repo, tag_name, verbosity, **kwargs): """Get list of all tested revisions""" valid_kwargs = dict([(k, v) for k, v in kwargs.items() if v is not None]) - fields, revs = get_test_runs(repo, tag_name, **valid_kwargs) + fields, revs = gitarchive.get_test_runs(log, repo, tag_name, **valid_kwargs) ignore_fields = ['tag_number'] if verbosity < 2: extra_fields = ['COMMITS', 'TEST RUNS'] @@ -133,36 +93,6 @@ def list_test_revs(repo, tag_name, verbosity, **kwargs): print_table(rows) -def get_test_revs(repo, tag_name, **kwargs): - """Get list of all tested revisions""" - fields, runs = get_test_runs(repo, tag_name, **kwargs) - - revs = {} - commit_i = fields.index('commit') - commit_num_i = fields.index('commit_number') - for run in runs: - commit = run[commit_i] - commit_num = run[commit_num_i] - tag = run[-1] - if not commit in revs: - revs[commit] = TestedRev(commit, commit_num, [tag]) - else: - assert commit_num == revs[commit].commit_number, "Commit numbers do not match" - revs[commit].tags.append(tag) - - # Return in sorted table - revs = sorted(revs.values(), key=attrgetter('commit_number')) - log.debug("Found %d tested revisions:\n %s", len(revs), - "\n ".join(['{} ({})'.format(rev.commit_number, rev.commit) for rev in revs])) - return revs - -def rev_find(revs, attr, val): - """Search from a list of TestedRev""" - for i, rev in enumerate(revs): - if getattr(rev, attr) == val: - return i - raise ValueError("Unable to find '{}' value '{}'".format(attr, val)) - def is_xml_format(repo, commit): """Check if the commit contains xml (or json) data""" if repo.rev_parse(commit + ':results.xml'): @@ -425,8 +355,8 @@ def print_html_report(data, id_comp, buildstats): # Compare buildstats bs_key = test + '.' + meas - rev = metadata['commit_num']['value'] - comp_rev = metadata['commit_num']['value_old'] + rev = str(metadata['commit_num']['value']) + comp_rev = str(metadata['commit_num']['value_old']) if (rev in buildstats and bs_key in buildstats[rev] and comp_rev in buildstats and bs_key in buildstats[comp_rev]): new_meas['buildstats'] = BSSummary(buildstats[comp_rev][bs_key], @@ -510,10 +440,10 @@ def auto_args(repo, args): key = split[0] val = split[1].strip() - if key == 'hostname': + if key == 'hostname' and not args.hostname: log.debug("Using hostname %s", val) args.hostname = val - elif key == 'branch': + elif key == 'branch' and not args.branch: log.debug("Using branch %s", val) args.branch = val @@ -539,7 +469,8 @@ Examine build performance test results from a Git repository""" default='{hostname}/{branch}/{machine}/{commit_number}-g{commit}/{tag_number}', help="Tag name (pattern) for finding results") group.add_argument('--hostname', '-H') - group.add_argument('--branch', '-B', default='master') + group.add_argument('--branch', '-B', default='master', help="Branch to find commit in") + group.add_argument('--branch2', help="Branch to find comparision revisions in") group.add_argument('--machine', default='qemux86') group.add_argument('--history-length', default=25, type=int, help="Number of tested revisions to plot in html report") @@ -575,32 +506,51 @@ def main(argv=None): if not args.hostname: auto_args(repo, args) - revs = get_test_revs(repo, args.tag_name, hostname=args.hostname, - branch=args.branch, machine=args.machine) - if len(revs) < 2: - log.error("%d tester revisions found, unable to generate report", - len(revs)) - return 1 + revs = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname, + branch=args.branch, machine=args.machine) + if args.branch2: + revs2 = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname, + branch=args.branch2, machine=args.machine) + if not len(revs2): + log.error("No revisions found to compare against") + return 1 + if not len(revs): + log.error("No revision to report on found") + return 1 + else: + if len(revs) < 2: + log.error("Only %d tester revisions found, unable to generate report" % len(revs)) + return 1 # Pick revisions if args.commit: if args.commit_number: log.warning("Ignoring --commit-number as --commit was specified") - index1 = rev_find(revs, 'commit', args.commit) + index1 = gitarchive.rev_find(revs, 'commit', args.commit) elif args.commit_number: - index1 = rev_find(revs, 'commit_number', args.commit_number) + index1 = gitarchive.rev_find(revs, 'commit_number', args.commit_number) else: index1 = len(revs) - 1 + if args.branch2: + revs2.append(revs[index1]) + index1 = len(revs2) - 1 + revs = revs2 + if args.commit2: if args.commit_number2: log.warning("Ignoring --commit-number2 as --commit2 was specified") - index2 = rev_find(revs, 'commit', args.commit2) + index2 = gitarchive.rev_find(revs, 'commit', args.commit2) elif args.commit_number2: - index2 = rev_find(revs, 'commit_number', args.commit_number2) + index2 = gitarchive.rev_find(revs, 'commit_number', args.commit_number2) else: if index1 > 0: index2 = index1 - 1 + # Find the closest matching commit number for comparision + # In future we could check the commit is a common ancestor and + # continue back if not but this good enough for now + while index2 > 0 and revs[index2].commit_number > revs[index1].commit_number: + index2 = index2 - 1 else: log.error("Unable to determine the other commit, use " "--commit2 or --commit-number2 to specify it") diff --git a/scripts/oe-git-archive b/scripts/oe-git-archive index 913291a99c..ab1c2b9ad4 100755 --- a/scripts/oe-git-archive +++ b/scripts/oe-git-archive @@ -14,16 +14,10 @@ # more details. # import argparse -import glob -import json import logging -import math import os import re import sys -from collections import namedtuple, OrderedDict -from datetime import datetime, timedelta, tzinfo -from operator import attrgetter # Import oe and bitbake libs scripts_path = os.path.dirname(os.path.realpath(__file__)) @@ -34,128 +28,13 @@ scriptpath.add_oe_lib_path() from oeqa.utils.git import GitRepo, GitError from oeqa.utils.metadata import metadata_from_bb - +import oeqa.utils.gitarchive as gitarchive # Setup logging logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s") log = logging.getLogger() -class ArchiveError(Exception): - """Internal error handling of this script""" - - -def format_str(string, fields): - """Format string using the given fields (dict)""" - try: - return string.format(**fields) - except KeyError as err: - raise ArchiveError("Unable to expand string '{}': unknown field {} " - "(valid fields are: {})".format( - string, err, ', '.join(sorted(fields.keys())))) - - -def init_git_repo(path, no_create, bare): - """Initialize local Git repository""" - path = os.path.abspath(path) - if os.path.isfile(path): - raise ArchiveError("Invalid Git repo at {}: path exists but is not a " - "directory".format(path)) - if not os.path.isdir(path) or not os.listdir(path): - if no_create: - raise ArchiveError("No git repo at {}, refusing to create " - "one".format(path)) - if not os.path.isdir(path): - try: - os.mkdir(path) - except (FileNotFoundError, PermissionError) as err: - raise ArchiveError("Failed to mkdir {}: {}".format(path, err)) - if not os.listdir(path): - log.info("Initializing a new Git repo at %s", path) - repo = GitRepo.init(path, bare) - try: - repo = GitRepo(path, is_topdir=True) - except GitError: - raise ArchiveError("Non-empty directory that is not a Git repository " - "at {}\nPlease specify an existing Git repository, " - "an empty directory or a non-existing directory " - "path.".format(path)) - return repo - - -def git_commit_data(repo, data_dir, branch, message, exclude, notes): - """Commit data into a Git repository""" - log.info("Committing data into to branch %s", branch) - tmp_index = os.path.join(repo.git_dir, 'index.oe-git-archive') - try: - # Create new tree object from the data - env_update = {'GIT_INDEX_FILE': tmp_index, - 'GIT_WORK_TREE': os.path.abspath(data_dir)} - repo.run_cmd('add .', env_update) - - # Remove files that are excluded - if exclude: - repo.run_cmd(['rm', '--cached'] + [f for f in exclude], env_update) - - tree = repo.run_cmd('write-tree', env_update) - - # Create new commit object from the tree - parent = repo.rev_parse(branch) - git_cmd = ['commit-tree', tree, '-m', message] - if parent: - git_cmd += ['-p', parent] - commit = repo.run_cmd(git_cmd, env_update) - - # Create git notes - for ref, filename in notes: - ref = ref.format(branch_name=branch) - repo.run_cmd(['notes', '--ref', ref, 'add', - '-F', os.path.abspath(filename), commit]) - - # Update branch head - git_cmd = ['update-ref', 'refs/heads/' + branch, commit] - if parent: - git_cmd.append(parent) - repo.run_cmd(git_cmd) - - # Update current HEAD, if we're on branch 'branch' - if not repo.bare and repo.get_current_branch() == branch: - log.info("Updating %s HEAD to latest commit", repo.top_dir) - repo.run_cmd('reset --hard') - - return commit - finally: - if os.path.exists(tmp_index): - os.unlink(tmp_index) - - -def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, - keywords): - """Generate tag name and message, with support for running id number""" - keyws = keywords.copy() - # Tag number is handled specially: if not defined, we autoincrement it - if 'tag_number' not in keyws: - # Fill in all other fields than 'tag_number' - keyws['tag_number'] = '{tag_number}' - tag_re = format_str(name_pattern, keyws) - # Replace parentheses for proper regex matching - tag_re = tag_re.replace('(', '\(').replace(')', '\)') + '$' - # Inject regex group pattern for 'tag_number' - tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') - - keyws['tag_number'] = 0 - for existing_tag in repo.run_cmd('tag').splitlines(): - match = re.match(tag_re, existing_tag) - - if match and int(match.group('tag_number')) >= keyws['tag_number']: - keyws['tag_number'] = int(match.group('tag_number')) + 1 - - tag_name = format_str(name_pattern, keyws) - msg_subj= format_str(msg_subj_pattern.strip(), keyws) - msg_body = format_str(msg_body_pattern, keyws) - return tag_name, msg_subj + '\n\n' + msg_body - - def parse_args(argv): """Parse command line arguments""" parser = argparse.ArgumentParser( @@ -217,17 +96,11 @@ def get_nested(d, list_of_keys): return "" def main(argv=None): - """Script entry point""" args = parse_args(argv) if args.debug: log.setLevel(logging.DEBUG) try: - if not os.path.isdir(args.data_dir): - raise ArchiveError("Not a directory: {}".format(args.data_dir)) - - data_repo = init_git_repo(args.git_dir, args.no_create, args.bare) - # Get keywords to be used in tag and branch names and messages metadata = metadata_from_bb() keywords = {'hostname': get_nested(metadata, ['hostname']), @@ -236,39 +109,12 @@ def main(argv=None): 'commit_count': get_nested(metadata, ['layers', 'meta', 'commit_count']), 'machine': get_nested(metadata, ['config', 'MACHINE'])} - # Expand strings early in order to avoid getting into inconsistent - # state (e.g. no tag even if data was committed) - commit_msg = format_str(args.commit_msg_subject.strip(), keywords) - commit_msg += '\n\n' + format_str(args.commit_msg_body, keywords) - branch_name = format_str(args.branch_name, keywords) - tag_name = None - if not args.no_tag and args.tag_name: - tag_name, tag_msg = expand_tag_strings(data_repo, args.tag_name, - args.tag_msg_subject, - args.tag_msg_body, keywords) - - # Commit data - commit = git_commit_data(data_repo, args.data_dir, branch_name, - commit_msg, args.exclude, args.notes) - - # Create tag - if tag_name: - log.info("Creating tag %s", tag_name) - data_repo.run_cmd(['tag', '-a', '-m', tag_msg, tag_name, commit]) - - # Push data to remote - if args.push: - cmd = ['push', '--tags'] - # If no remote is given we push with the default settings from - # gitconfig - if args.push is not True: - notes_refs = ['refs/notes/' + ref.format(branch_name=branch_name) - for ref, _ in args.notes] - cmd.extend([args.push, branch_name] + notes_refs) - log.info("Pushing data to remote") - data_repo.run_cmd(cmd) + gitarchive.gitarchive(args.data_dir, args.git_dir, args.no_create, args.bare, + args.commit_msg_subject.strip(), args.commit_msg_body, args.branch_name, + args.no_tag, args.tag_name, args.tag_msg_subject, args.tag_msg_body, + args.exclude, args.notes, args.push, keywords, log) - except ArchiveError as err: + except gitarchive.ArchiveError as err: log.error(str(err)) return 1 diff --git a/scripts/resulttool b/scripts/resulttool new file mode 100755 index 0000000000..18ac101923 --- /dev/null +++ b/scripts/resulttool @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +# +# test results tool - tool for manipulating OEQA test result json files +# (merge results, summarise results, regression analysis, generate manual test results file) +# +# To look for help information. +# $ resulttool +# +# To store test results from oeqa automated tests, execute the below +# $ resulttool store <source_dir> <git_branch> +# +# To merge test results, execute the below +# $ resulttool merge <base_result_file> <target_result_file> +# +# To report test report, execute the below +# $ resulttool report <source_dir> +# +# To perform regression file analysis, execute the below +# $ resulttool regression-file <base_result_file> <target_result_file> +# +# To execute manual test cases, execute the below +# $ resulttool manualexecution <manualjsonfile> +# +# By default testresults.json for manualexecution store in <build>/tmp/log/manual/ +# +# Copyright (c) 2019, Intel Corporation. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# + +import os +import sys +import argparse +import logging +script_path = os.path.dirname(os.path.realpath(__file__)) +lib_path = script_path + '/lib' +sys.path = sys.path + [lib_path] +import argparse_oe +import scriptutils +import resulttool.merge +import resulttool.store +import resulttool.regression +import resulttool.report +import resulttool.manualexecution +logger = scriptutils.logger_create('resulttool') + +def main(): + parser = argparse_oe.ArgumentParser(description="OEQA test result manipulation tool.", + epilog="Use %(prog)s <subcommand> --help to get help on a specific command") + parser.add_argument('-d', '--debug', help='enable debug output', action='store_true') + parser.add_argument('-q', '--quiet', help='print only errors', action='store_true') + subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>') + subparsers.required = True + subparsers.add_subparser_group('manualexecution', 'manual testcases', 300) + resulttool.manualexecution.register_commands(subparsers) + subparsers.add_subparser_group('setup', 'setup', 200) + resulttool.merge.register_commands(subparsers) + resulttool.store.register_commands(subparsers) + subparsers.add_subparser_group('analysis', 'analysis', 100) + resulttool.regression.register_commands(subparsers) + resulttool.report.register_commands(subparsers) + + args = parser.parse_args() + if args.debug: + logger.setLevel(logging.DEBUG) + elif args.quiet: + logger.setLevel(logging.ERROR) + + try: + ret = args.func(args, logger) + except argparse_oe.ArgumentUsageError as ae: + parser.error_subcommand(ae.message, ae.subcommand) + return ret + +if __name__ == "__main__": + sys.exit(main()) diff --git a/scripts/runqemu b/scripts/runqemu index 1316aa4b5c..b231ae6f83 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -290,7 +290,7 @@ class BaseConfig(object): def check_arg_fstype(self, fst): """Check and set FSTYPE""" if fst not in self.fstypes + self.vmtypes: - logger.warn("Maybe unsupported FSTYPE: %s" % fst) + logger.warning("Maybe unsupported FSTYPE: %s" % fst) if not self.fstype or self.fstype == fst: if fst == 'ramfs': fst = 'cpio.gz' @@ -352,7 +352,7 @@ class BaseConfig(object): self.qemuboot = qb self.qbconfload = True else: - logger.warn("%s doesn't exist" % qb) + logger.warning("%s doesn't exist" % qb) else: raise RunQemuError("Can't find FSTYPE from: %s" % p) @@ -692,7 +692,7 @@ class BaseConfig(object): if not self.get('QB_AUDIO_DRV'): raise RunQemuError("QB_AUDIO_DRV is NULL, this board doesn't support audio") if not self.get('QB_AUDIO_OPT'): - logger.warn('QB_AUDIO_OPT is NULL, you may need define it to make audio work') + logger.warning('QB_AUDIO_OPT is NULL, you may need define it to make audio work') else: self.qemu_opt_script += ' %s' % self.get('QB_AUDIO_OPT') os.putenv('QEMU_AUDIO_DRV', self.get('QB_AUDIO_DRV')) @@ -714,7 +714,7 @@ class BaseConfig(object): if self.get('DEPLOY_DIR_IMAGE'): deploy_dir_image = self.get('DEPLOY_DIR_IMAGE') else: - logger.warn("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") + logger.warning("Can't find qemuboot conf file, DEPLOY_DIR_IMAGE is NULL!") return if self.rootfs and not os.path.exists(self.rootfs): @@ -1058,9 +1058,9 @@ class BaseConfig(object): # virtio might have been selected explicitly (just use it), or # is used as fallback (then warn about that). if not drive_type.startswith("/dev/vd"): - logger.warn("Unknown QB_DRIVE_TYPE: %s" % drive_type) - logger.warn("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") - logger.warn('Trying to use virtio block drive') + logger.warning("Unknown QB_DRIVE_TYPE: %s" % drive_type) + logger.warning("Failed to figure out drive type, consider define or fix QB_DRIVE_TYPE") + logger.warning('Trying to use virtio block drive') vm_drive = '-drive if=virtio,file=%s,format=%s' % (self.rootfs, rootfs_format) # All branches above set vm_drive. @@ -1275,7 +1275,7 @@ class BaseConfig(object): self.bitbake_e = subprocess.check_output(cmd, shell=True).decode('utf-8') except subprocess.CalledProcessError as err: self.bitbake_e = '' - logger.warn("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) + logger.warning("Couldn't run 'bitbake -e' to gather environment information:\n%s" % err.output.decode('utf-8')) def validate_combos(self): if (self.fstype in self.vmtypes) and self.kernel: diff --git a/scripts/wic b/scripts/wic index 7392bc4e7f..b4b7212cfa 100755 --- a/scripts/wic +++ b/scripts/wic @@ -35,6 +35,7 @@ import os import sys import argparse import logging +import subprocess from collections import namedtuple from distutils import spawn @@ -63,10 +64,7 @@ if os.environ.get('SDKTARGETSYSROOT'): bitbake_exe = spawn.find_executable('bitbake') if bitbake_exe: bitbake_path = scriptpath.add_bitbake_lib_path() - from bb import cookerdata - from bb.main import bitbake_main, BitBakeConfigParameters -else: - bitbake_main = None + import bb from wic import WicError from wic.misc import get_bitbake_var, BB_VARS @@ -124,7 +122,7 @@ def wic_create_subcommand(options, usage_str): Command-line handling for image creation. The real work is done by image.engine.wic_create() """ - if options.build_rootfs and not bitbake_main: + if options.build_rootfs and not bitbake_exe: raise WicError("Can't build rootfs as bitbake is not in the $PATH") if not options.image_name: @@ -160,9 +158,7 @@ def wic_create_subcommand(options, usage_str): argv.append("--debug") logger.info("Building rootfs...\n") - if bitbake_main(BitBakeConfigParameters(argv), - cookerdata.CookerConfiguration()): - raise WicError("bitbake exited with error") + subprocess.check_call(argv) rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name) kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name) @@ -179,9 +175,7 @@ def wic_create_subcommand(options, usage_str): if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)): logger.info("Building wic-tools...\n") - if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()), - cookerdata.CookerConfiguration()): - raise WicError("bitbake wic-tools failed") + subprocess.check_call(["bitbake", "wic-tools"]) native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools") if not native_sysroot: @@ -362,6 +356,8 @@ def wic_init_parser_create(subparser): "bitbake variables") subparser.add_argument("-D", "--debug", dest="debug", action="store_true", default=False, help="output debug information") + subparser.add_argument("-i", "--imager", dest="imager", + default="direct", help="the wic imager plugin") return |