Author: richter Date: Sun Apr 17 23:19:42 2011 New Revision: 2531 Log: move the testbed plugin folder to a central position Added: trunk/tools/testbed/plugins/ trunk/tools/testbed/plugins/actions/ trunk/tools/testbed/plugins/actions/build/ trunk/tools/testbed/plugins/actions/build/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/build/node_hook trunk/tools/testbed/plugins/actions/clean/ trunk/tools/testbed/plugins/actions/clean/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/clean/node_hook trunk/tools/testbed/plugins/actions/create/ trunk/tools/testbed/plugins/actions/create/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/create/node_hook trunk/tools/testbed/plugins/actions/create/pre_hook trunk/tools/testbed/plugins/actions/deploy/ trunk/tools/testbed/plugins/actions/deploy/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook trunk/tools/testbed/plugins/actions/get/ trunk/tools/testbed/plugins/actions/get/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/get/node_hook trunk/tools/testbed/plugins/actions/install/ trunk/tools/testbed/plugins/actions/install/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/install/node_hook trunk/tools/testbed/plugins/actions/plugins/ trunk/tools/testbed/plugins/actions/plugins/pre_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/plugins/pre_hook trunk/tools/testbed/plugins/actions/prepare/ trunk/tools/testbed/plugins/actions/prepare/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/prepare/node_hook trunk/tools/testbed/plugins/actions/put/ trunk/tools/testbed/plugins/actions/put/node_hook trunk/tools/testbed/plugins/actions/run/ trunk/tools/testbed/plugins/actions/run/node_hook trunk/tools/testbed/plugins/actions/start/ trunk/tools/testbed/plugins/actions/start/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/start/node_hook trunk/tools/testbed/plugins/actions/stop/ trunk/tools/testbed/plugins/actions/stop/node_hook - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook trunk/tools/testbed/plugins/classes/ trunk/tools/testbed/plugins/classes/debian/ trunk/tools/testbed/plugins/classes/debian/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build trunk/tools/testbed/plugins/classes/debian/clean trunk/tools/testbed/plugins/classes/debian/files/ trunk/tools/testbed/plugins/classes/debian/files/DEBIAN/ trunk/tools/testbed/plugins/classes/debian/files/DEBIAN/control - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/DEBIAN/control trunk/tools/testbed/plugins/classes/debian/files/etc/ trunk/tools/testbed/plugins/classes/debian/files/etc/hostname - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/etc/hostname trunk/tools/testbed/plugins/classes/generic/ trunk/tools/testbed/plugins/classes/generic/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build trunk/tools/testbed/plugins/classes/generic/clean trunk/tools/testbed/plugins/classes/openwrt/ trunk/tools/testbed/plugins/classes/openwrt/deploy trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys.new - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.new trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys.save - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.save trunk/tools/testbed/plugins/classes/openwrt/pkg_list - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/pkg_list trunk/tools/testbed/plugins/classes/opkg/ trunk/tools/testbed/plugins/classes/opkg/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build trunk/tools/testbed/plugins/classes/opkg/clean trunk/tools/testbed/plugins/classes/opkg/files/ trunk/tools/testbed/plugins/classes/opkg/files/CONTROL/ trunk/tools/testbed/plugins/classes/opkg/files/CONTROL/control - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/files/CONTROL/control trunk/tools/testbed/plugins/classes/opkg/ipkg-build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/ipkg-build trunk/tools/testbed/plugins/classes/ubuntu_live/ trunk/tools/testbed/plugins/classes/ubuntu_live/README.diskdefines - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/README.diskdefines trunk/tools/testbed/plugins/classes/ubuntu_live/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build trunk/tools/testbed/plugins/classes/ubuntu_live/clean - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/clean trunk/tools/testbed/plugins/classes/ubuntu_live/files/ trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/ trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/apt/ trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/apt/sources.list - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/apt/sources.list trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/casper.conf - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/casper.conf trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/ssh/ trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/ssh/sshd_config - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/ssh/sshd_config trunk/tools/testbed/plugins/classes/ubuntu_live/isolinux.cfg - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/isolinux.cfg trunk/tools/testbed/plugins/classes/ubuntu_live/pkg_list - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/pkg_list trunk/tools/testbed/plugins/classes/vbox/ trunk/tools/testbed/plugins/classes/vbox/clean - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/clean trunk/tools/testbed/plugins/classes/vbox/create - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/create trunk/tools/testbed/plugins/classes/vbox/start - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/start trunk/tools/testbed/plugins/classes/vbox/stop - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/stop trunk/tools/testbed/plugins/extern/ trunk/tools/testbed/plugins/extern/hipl/ trunk/tools/testbed/plugins/extern/hipl/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/build trunk/tools/testbed/plugins/extern/hipl/prepare - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/prepare trunk/tools/testbed/plugins/extern/openwrt/ trunk/tools/testbed/plugins/extern/openwrt/build trunk/tools/testbed/plugins/extern/openwrt/prepare trunk/tools/testbed/plugins/extern/pisa/ trunk/tools/testbed/plugins/extern/pisa/build - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build trunk/tools/testbed/plugins/extern/pisa/prepare - copied, changed from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/prepare Deleted: trunk/tools/testbed/pisa-testbed_vms/plugins/actions/build/init trunk/tools/testbed/pisa-testbed_vms/plugins/actions/build/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/clean/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/create/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/create/pre_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/get/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/install/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/plugins/pre_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/prepare/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/prepare/post_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/put/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/run/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/start/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/clean trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/DEBIAN/control trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/etc/hostname trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/clean trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.new trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.save trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/pkg_list trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/prepare trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/files/CONTROL/control trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/ipkg-build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/README.diskdefines trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/clean trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/apt/sources.list trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/casper.conf trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/ssh/sshd_config trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/isolinux.cfg trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/pkg_list trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/clean trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/create trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/start trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/stop trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/build trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/prepare trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/build trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/prepare trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/prepare trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/build/init trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/build/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/clean/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/get/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/install/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/plugins/pre_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/prepare/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/prepare/post_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/put/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/actions/run/node_hook trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/debian/build trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/debian/files/DEBIAN/control trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/debian/files/etc/hostname trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/generic/build trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/build trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/dot_config_linksys trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/dot_config_linksys.new trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/dot_config_linksys.save trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/dot_config_linksys_full trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/pkg_list trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/openwrt/prepare trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/opkg/build trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/opkg/files/CONTROL/control trunk/tools/testbed/pisa-testbed_wlan/plugins/classes/opkg/ipkg-build Copied and modified: trunk/tools/testbed/plugins/actions/build/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/build/node_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/actions/clean/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/clean/node_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/actions/create/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/create/node_hook) ============================================================================== Added: trunk/tools/testbed/plugins/actions/create/pre_hook ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/actions/create/pre_hook Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "creating $TARGETS " +pisa-testbed $TARGETS stop +pisa-testbed $TARGETS clean +pisa-testbed $TARGETS prepare +pisa-testbed $TARGETS build +echo " ... done" Copied and modified: trunk/tools/testbed/plugins/actions/deploy/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook) ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook Sun Apr 17 22:36:07 2011 (r2530, copy source) +++ trunk/tools/testbed/plugins/actions/deploy/node_hook Sun Apr 17 23:19:42 2011 (r2531) @@ -1,10 +1,10 @@ #!/bin/sh -echo "stopping $NODE " +echo "deploying $NODE " for CLASS in $(cat $BUILD_PATH/${NODE}_classes); do CLASS_PATH="$TESTBED_PATH/plugins/classes/$CLASS" if [ -d "$CLASS_PATH" ]; then - [ -f "$CLASS_PATH/stop" ] && . $CLASS_PATH/stop + [ -f "$CLASS_PATH/deploy" ] && . $CLASS_PATH/deploy fi done echo " ... done" Copied and modified: trunk/tools/testbed/plugins/actions/get/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/get/node_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/actions/install/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/install/node_hook) ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/actions/install/node_hook Sun Apr 17 22:36:07 2011 (r2530, copy source) +++ trunk/tools/testbed/plugins/actions/install/node_hook Sun Apr 17 23:19:42 2011 (r2531) @@ -1,6 +1,6 @@ #!/bin/sh PKG_LIST="" -for PKG in $PACKAGES; do +for PKG in $ARGUMENTS; do if [ $PKG = "-c" ]; then shift 1 run "cd /tmp; $* $PKG_LIST; rm $PKG_LIST" Copied and modified: trunk/tools/testbed/plugins/actions/plugins/pre_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/plugins/pre_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/actions/prepare/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/prepare/node_hook) ============================================================================== Added: trunk/tools/testbed/plugins/actions/put/node_hook ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/actions/put/node_hook Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,3 @@ +#!/bin/sh + +scp -P "${SSH_PORT:-22}" "$BIN_PATH/openwrt-$TESTBED_NAME.bin" "${SSH_USER:-$USER}@${SSH_HOST:-$NODE}:/tmp" Added: trunk/tools/testbed/plugins/actions/run/node_hook ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/actions/run/node_hook Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,3 @@ +#!/bin/sh +SSH_HOST="pisa-$NODE" +ssh -t -p ${SSH_PORT:-22} ${SSH_USER:-$USER}@${SSH_HOST:-$NODE} sh "-l -c \"$ARGUMENTS\"" Copied and modified: trunk/tools/testbed/plugins/actions/start/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/start/node_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/actions/stop/node_hook (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/actions/stop/node_hook) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/debian/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build) ============================================================================== Added: trunk/tools/testbed/plugins/classes/debian/clean ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/classes/debian/clean Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,3 @@ +#!/bin/sh + +rm -rf "$BIN_PATH/${FULL_NAME}"*.deb Copied and modified: trunk/tools/testbed/plugins/classes/debian/files/DEBIAN/control (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/DEBIAN/control) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/debian/files/etc/hostname (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/files/etc/hostname) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/generic/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build) ============================================================================== Added: trunk/tools/testbed/plugins/classes/generic/clean ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/classes/generic/clean Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,3 @@ +#!/bin/sh + +rm -rf "$BIN_PATH/${FULL_NAME}"*.tar.gz Added: trunk/tools/testbed/plugins/classes/openwrt/deploy ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/classes/openwrt/deploy Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,5 @@ +#!/bin/sh + +pisa-testbed $NODE put "$BIN_PATH/openwrt-$TESTBED_NAME.bin" +pisa-testbed $NODE run mtd -r write "/tmp/openwrt-$TESTBED_NAME.bin" firmware +pisa-testbed $NODE install "$BIN_PATH/${FULL_NAME}_${VERSION}_all.ipk" -c "opkg install" Copied and modified: trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys.new (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.new) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/openwrt/dot_config_linksys.save (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/dot_config_linksys.save) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/openwrt/pkg_list (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/pkg_list) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/opkg/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build) ============================================================================== Added: trunk/tools/testbed/plugins/classes/opkg/clean ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/classes/opkg/clean Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,3 @@ +#!/bin/sh + +rm -rf "$BIN_PATH/${FULL_NAME}"*.ipk Copied and modified: trunk/tools/testbed/plugins/classes/opkg/files/CONTROL/control (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/files/CONTROL/control) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/opkg/ipkg-build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/ipkg-build) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/README.diskdefines (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/README.diskdefines) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/clean (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/clean) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/apt/sources.list (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/apt/sources.list) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/casper.conf (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/casper.conf) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/files/etc/ssh/sshd_config (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/files/etc/ssh/sshd_config) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/isolinux.cfg (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/isolinux.cfg) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/ubuntu_live/pkg_list (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/pkg_list) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/vbox/clean (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/clean) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/vbox/create (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/create) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/vbox/start (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/start) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/classes/vbox/stop (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/classes/vbox/stop) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/extern/hipl/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/build) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/extern/hipl/prepare (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/hipl/prepare) ============================================================================== Added: trunk/tools/testbed/plugins/extern/openwrt/build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/extern/openwrt/build Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,20 @@ +#!/bin/sh + +build_openwrt(){ + grep -l openwrt "$BUILD_PATH"/*_classes | xargs cat | sort | uniq | while read -r NODE_TYPE; do + case $NODE_TYPE in + linksys) + "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed "$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE" + (cd $OPENWRT_PATH; make &> make.log) + cp "$OPENWRT_PATH/bin/ar71xx/openwrt-ar71xx-wrt160nl-squashfs.bin" \ + "$BIN_PATH/openwrt-$TESTBED_NAME.bin" + ;; + vbox) + "$PISA_PATH"/openwrt/configure_router.sh pisa-testbed "$OPENWRT_PATH" "$PISA_PATH" "$HIPL_PATH" "$NODE_TYPE" + (cd $OPENWRT_PATH; make &> make.log) + cp `ls -t $OPENWRT_PATH/bin/x86/*.vdi | head -1` \ + $BIN_PATH/openwrt-$TESTBED_NAME.vdi + ;; + esac + done +} Added: trunk/tools/testbed/plugins/extern/openwrt/prepare ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tools/testbed/plugins/extern/openwrt/prepare Sun Apr 17 23:19:42 2011 (r2531) @@ -0,0 +1,9 @@ +#!/bin/sh + +prepare_openwrt(){ + if ! [ -d "${OPENWRT_PATH:?}" ]; then + echo "downloading openwrt" + mkdir -p "$OPENWRT_PATH" + svn co svn://svn.openwrt.org/openwrt/tags/backfire_10.03 "$OPENWRT_PATH" + fi +} Copied and modified: trunk/tools/testbed/plugins/extern/pisa/build (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build) ============================================================================== Copied and modified: trunk/tools/testbed/plugins/extern/pisa/prepare (from r2530, trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/prepare) ============================================================================== -- This is the pisa developer mailing list. Please also subscribe to the main pisa list at: //www.freelists.org/list/pisa