testing: remove CI symlink hacks

When configuring the image to be tested, symlinks are no longer needed. Signed-off-by: Patrick Ohly <[email protected]>
ostroproject · Apr 8, 2016 · 15aa34d · 15aa34d
1 parent 3b0221e
commit 15aa34d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 30 deletions.
diff --git a/meta-ostro/classes/ostro-image.bbclass b/meta-ostro/classes/ostro-image.bbclass
@@ -239,17 +239,6 @@ OSTRO_IMAGE_INSTALL_REFERENCE = "${@ostro_image_bundles_to_packages('reference',
 OSTRO_IMAGE_INSTALL_QA = "${@ostro_image_bundles_to_packages('qa', d)}"
 OSTRO_IMAGE_INSTALL_ALL = "${@ostro_image_bundles_to_packages('all', d)}"
 
-# Create compatibility symlinks for the Ostro OS CI system, which
-# currently expects to find "ostro-image-edison.ext4" inside the
-# archives prepared for Edison.
-IMAGE_CMD_toflash_append () {
-        if [ "${IMAGE_BASENAME}" != "ostro-image" ]; then
-            for i in ext4 hddimg update.hddimg; do
-                ln -s ${IMAGE_BASENAME}-${MACHINE}.$i ${WORKDIR}/toFlash/ostro-image-${MACHINE}.$i
-            done
-        fi
-}
-
 # The AppFW depends on the security framework and user management, and these frameworks
 # (currently?) make little sense without apps, therefore a single image feature is used
 # for all of these.

diff --git a/meta-ostro/conf/distro/include/ostroproject-ci.inc b/meta-ostro/conf/distro/include/ostroproject-ci.inc
@@ -38,24 +38,6 @@ require conf/distro/include/ostro-os-development.inc
 # (those using U-Boot: edison and beaglebone)
 OSTRO_VM_IMAGE_TYPES = "dsk.xz dsk.zip dsk.vdi.zip dsk.bmap dsk.xz.sha256sum dsk.vdi.zip.sha256sum"
 
-do_swupd_update_prepend () {
-    # The CI testing setup only knows about testing "ostro-image".
-    # Provide a symlink to the real image that we want to have
-    # tested, which is ostro-image-swupd-dev.
-    if [ "${PN}" = "ostro-image-swupd" ]; then
-        bbwarn "Setting up ostro-image CI testing compatibility links"
-        for i in '${IMAGE_NAME}.dsk.xz' '${IMAGE_NAME}-disk-layout.json' '${PN}-beaglebone.tar.bz2' '${PN}-edison.toflash.tar.bz2'; do
-            if echo $i | grep -q ${MACHINE}; then
-                target=$(echo $i | sed -e 's/${PN}-/${PN}-dev-/')
-                link=$(echo $i | sed -e 's/${PN}-/ostro-image-/')
-                bbwarn "symlink ${DEPLOY_DIR_IMAGE}/$link -> $target"
-                mkdir -p "${DEPLOY_DIR_IMAGE}"
-                ln -s "$target" "${DEPLOY_DIR_IMAGE}/$link"
-            fi
-        done
-    fi
-}
-
 #
 # Automated build targets
 # Those targets should be space separated list of items,
@@ -76,7 +58,7 @@ OSTROPROJECT_CI_TEST_EXPORT_TARGETS="ostro-image-swupd-dev"
 # test suite and test files.
 # Space separated list of tuples, each should in format:
 # <image_name>,<testsuite_name>,<testfiles_name>,$MACHINE
-OSTROPROJECT_CI_TEST_RUNS="${DISTRO}-image,iot-testsuite.tar.gz,iot-testfiles.${MACHINE}.tar.gz,${MACHINE}"
+OSTROPROJECT_CI_TEST_RUNS="ostro-image-swupd-dev,iot-testsuite.tar.gz,iot-testfiles.${MACHINE}.tar.gz,${MACHINE}"
 
 # In the CI system, the integer OS version used for swupd is derived
 # from the Jenkins build number part of the BUILD_ID. The conversion