export kiwi build results in --skip-bundle case

openSUSE · Apr 20, 2021 · dfbbe16 · dfbbe16
1 parent b6d635e
commit dfbbe16
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/build b/build
@@ -1125,9 +1125,6 @@ while test -n "$1"; do
 	OBSURL=$ARG
 	shift
       ;;
-      -skip-bundle)
-	BUILD_SKIP_BUNDLE=1
-      ;;
       ---noarg)
 	cleanup_and_exit 1 "$ARG does not take an argument"
       ;;

diff --git a/build-recipe b/build-recipe
@@ -63,6 +63,9 @@ recipe_parse_options() {
 	KIWI_PARAMETERS="$KIWI_PARAMETERS $ARG"
 	shift
 	;;
+      -skip-bundle)
+	BUILD_SKIP_BUNDLE=1
+      ;;
       -*)
 	return 1
 	;;

diff --git a/build-recipe-kiwi b/build-recipe-kiwi
@@ -488,7 +488,10 @@ perform_image_build() {
 perform_image_bundle() {
     local imgtype=$1
     local profile=$2
-    test -n "$BUILD_SKIP_BUNDLE" && return 0
+    if test -n "$BUILD_SKIP_BUNDLE"; then
+       mv $BUILD_ROOT/$TOPDIR/KIWI-$imgtype/* $BUILD_ROOT/$TOPDIR/KIWI/
+       return 0
+    fi
 
     local bundle_call
     local bundle_id="Build$RELEASE"

diff --git a/build-vm b/build-vm
@@ -949,6 +949,7 @@ vm_first_stage() {
     echo "BUILD_FLAVOR='$BUILD_FLAVOR'" >> $BUILD_ROOT/.build/build.data
     echo "OBS_PACKAGE='$OBS_PACKAGE'" >> $BUILD_ROOT/.build/build.data
     echo "REMOVE_CCACHE='$REMOVE_CCACHE'" >> $BUILD_ROOT/.build/build.data
+    echo "BUILD_SKIP_BUNDLE='$BUILD_SKIP_BUNDLE'" >> $BUILD_ROOT/.build/build.data
     # fallback time for broken hosts
     rm -rf $BUILD_ROOT/.build/.date
     date '+@%s' > $BUILD_ROOT/.build/.date