From 9dd3b80e98705c341b0d702b8fbcd17506803b81 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Mon, 17 Dec 2012 14:52:40 +0000 Subject: Add image inspection plugin This adds a `run-in-artifact` command which allows another command to be run in a system. There is also a `content-manifest` command which gives a manifest of the artifacts, which commits they were built from, and if possible, a version. This adds a morphlib.bins.call_in_artifact_directory() method to run a command inside an artifact and to generate a manifest. --- .../run-in-artifact-propagates-exit-code.exit | 1 + .../run-in-artifact-propagates-exit-code.script | 33 +++++++++++++++ .../run-in-artifact-propagates-exit-code.stderr | 3 ++ ...run-in-artifact-with-different-artifacts.script | 47 ++++++++++++++++++++++ ...run-in-artifact-with-different-artifacts.stderr | 1 + ...run-in-artifact-with-different-artifacts.stdout | 14 +++++++ 6 files changed, 99 insertions(+) create mode 100644 tests.as-root/run-in-artifact-propagates-exit-code.exit create mode 100755 tests.as-root/run-in-artifact-propagates-exit-code.script create mode 100644 tests.as-root/run-in-artifact-propagates-exit-code.stderr create mode 100755 tests.as-root/run-in-artifact-with-different-artifacts.script create mode 100644 tests.as-root/run-in-artifact-with-different-artifacts.stderr create mode 100644 tests.as-root/run-in-artifact-with-different-artifacts.stdout (limited to 'tests.as-root') diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.exit b/tests.as-root/run-in-artifact-propagates-exit-code.exit new file mode 100644 index 00000000..d00491fd --- /dev/null +++ b/tests.as-root/run-in-artifact-propagates-exit-code.exit @@ -0,0 +1 @@ +1 diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.script b/tests.as-root/run-in-artifact-propagates-exit-code.script new file mode 100755 index 00000000..d815c73d --- /dev/null +++ b/tests.as-root/run-in-artifact-propagates-exit-code.script @@ -0,0 +1,33 @@ +#!/bin/bash +# +# Copyright (C) 2012-2013 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that 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. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +## Test that 'run-in-artifact' propagates the exit code of its command. + +set -eu + +. "$SRCDIR/tests.as-root/lib" + +# Build first image. Remember the stratum. +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs master linux-system + +system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs') + +# Run 'run-in-artifact' with the system artifact. The command will fail +# and this should result in an exit code of 1 in the test. +"$SRCDIR/scripts/test-morph" run-in-artifact "$system" -- ls i-do-not-exist diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.stderr b/tests.as-root/run-in-artifact-propagates-exit-code.stderr new file mode 100644 index 00000000..98aa5450 --- /dev/null +++ b/tests.as-root/run-in-artifact-propagates-exit-code.stderr @@ -0,0 +1,3 @@ +ERROR: Command failed: ls i-do-not-exist +ls: i-do-not-exist: No such file or directory + diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script b/tests.as-root/run-in-artifact-with-different-artifacts.script new file mode 100755 index 00000000..0b14f527 --- /dev/null +++ b/tests.as-root/run-in-artifact-with-different-artifacts.script @@ -0,0 +1,47 @@ +#!/bin/bash +# +# Copyright (C) 2012-2013 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that 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. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +## Test the 'run-in-artifact' command with different types of artifacts. + +set -eu + +. "$SRCDIR/tests.as-root/lib" + +# Build first image. Remember the stratum. +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs master linux-system + +system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs') +chunk=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.chunk.linux') +stratum=$(find "$DATADIR/cache/artifacts" -maxdepth 1 \ + -name '*.stratum.linux-stratum') + +# Run 'run-in-artifact' with the system artifact. +echo "System:" +"$SRCDIR/scripts/test-morph" run-in-artifact "$system" -- ls factory/baserock/ +echo + +# Run 'run-in-artifact' with the chunk artifact. +echo "Chunk:" +"$SRCDIR/scripts/test-morph" run-in-artifact "$chunk" -- ls baserock/ +echo + +# Run 'run-in-artifact' with the statum artifact. +echo "Stratum:" +"$SRCDIR/scripts/test-morph" run-in-artifact "$stratum" -- ls baserock/ \ + || echo "Failed" diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stderr b/tests.as-root/run-in-artifact-with-different-artifacts.stderr new file mode 100644 index 00000000..44e70c38 --- /dev/null +++ b/tests.as-root/run-in-artifact-with-different-artifacts.stderr @@ -0,0 +1 @@ +ERROR: Artifact TMP/cache/artifacts/293fc1b78dd2af221ae7de246ff5a59df476165704b7e366230ac8ed4c16d1b7.stratum.linux-stratum cannot be extracted or mounted diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stdout b/tests.as-root/run-in-artifact-with-different-artifacts.stdout new file mode 100644 index 00000000..281ab109 --- /dev/null +++ b/tests.as-root/run-in-artifact-with-different-artifacts.stdout @@ -0,0 +1,14 @@ +System: +hello-stratum.meta +hello.meta +linux-stratum.meta +linux-system-rootfs.meta +linux.meta +tools-stratum.meta +tools.meta + +Chunk: +linux.meta + +Stratum: +Failed -- cgit v1.2.1