Author: richter Date: Mon Apr 4 14:58:37 2011 New Revision: 2502 Log: use BIN_PATH variable in the virtual testbed plugins Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/actions/vbox/node_hook trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/build trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/actions/vbox/node_hook ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/actions/vbox/node_hook Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/actions/vbox/node_hook Mon Apr 4 14:58:37 2011 (r2502) @@ -6,8 +6,8 @@ VBoxManage -q storageattach "$FULL_NAME" --storagectl "IDE Controller" --port 0 --device 0 --medium none # VBoxManage -q storageattach "$FULL_NAME" --storagectl "SATA Controller" --port 0 --device 0 --medium none VBoxManage -q closemedium dvd "$VBOX_ISO" - VBoxManage -q closemedium dvd "$TESTBED_PATH/bin/${FULL_NAME}.iso" -# VBoxManage -q closemedium disk "$TESTBED_PATH/bin/${FULL_NAME}.vdi" + VBoxManage -q closemedium dvd "$BIN_PATH/${FULL_NAME}.iso" +# VBoxManage -q closemedium disk "$BIN_PATH/${FULL_NAME}.vdi" VBoxManage -q unregistervm "$FULL_NAME" --delete } @@ -25,12 +25,12 @@ VBoxManage -q openmedium dvd $VBOX_ISO VBoxManage -q storageattach $FULL_NAME --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium $VBOX_ISO -# rm -f "$TESTBED_PATH/bin/$FULL_NAME".vdi -# VBoxManage -q convertfromraw "$TESTBED_PATH/bin/$FULL_NAME".img "$TESTBED_PATH/bin/$FULL_NAME".vdi -# VBoxManage -q openmedium disk "$TESTBED_PATH/bin/$FULL_NAME".vdi -# VBoxManage -q storageattach $FULL_NAME --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$TESTBED_PATH/bin/$FULL_NAME.vdi" - VBoxManage -q openmedium dvd "$TESTBED_PATH/bin/${FULL_NAME}.iso" - VBoxManage -q storageattach $FULL_NAME --storagectl "IDE Controller" --port 0 --device 1 --type dvddrive --medium "$TESTBED_PATH/bin/${FULL_NAME}.iso" +# rm -f "$BIN_PATH/$FULL_NAME".vdi +# VBoxManage -q convertfromraw "$BIN_PATH/$FULL_NAME".img "$BIN_PATH/$FULL_NAME".vdi +# VBoxManage -q openmedium disk "$BIN_PATH/$FULL_NAME".vdi +# VBoxManage -q storageattach $FULL_NAME --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium "$BIN_PATH/$FULL_NAME.vdi" + VBoxManage -q openmedium dvd "$BIN_PATH/${FULL_NAME}.iso" + VBoxManage -q storageattach $FULL_NAME --storagectl "IDE Controller" --port 0 --device 1 --type dvddrive --medium "$BIN_PATH/${FULL_NAME}.iso" } recreate(){ Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/classes/debian/build Mon Apr 4 14:58:37 2011 (r2502) @@ -1,6 +1,6 @@ #!/bin/sh build_debian(){ - dpkg-deb -b "$NODE_PATH" "$TESTBED_PATH/bin/$FULL_NAME-${VERSION}_all.deb" + dpkg-deb -b "$NODE_PATH" "$BIN_PATH/$FULL_NAME-${VERSION}_all.deb" } Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/classes/generic/build Mon Apr 4 14:58:37 2011 (r2502) @@ -1,5 +1,5 @@ #!/bin/sh build_generic(){ - fakeroot tar -czf "$TESTBED_PATH/bin/${FULL_NAME}.tar.gz" --exclude=DEBIAN --exclude=CONTROL -C "$NODE_PATH" . + fakeroot tar -czf "$BIN_PATH/${FULL_NAME}.tar.gz" --exclude=DEBIAN --exclude=CONTROL -C "$NODE_PATH" . } Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/classes/openwrt/build Mon Apr 4 14:58:37 2011 (r2502) @@ -12,11 +12,11 @@ case $NODE_TYPE in linksys) cp `ls -t $OPENWRT_PATH/bin/ar71xx/openwrt-ar71xx-wrt160nl-squashfs.bin | head -1` \ - $TESTBED_PATH/bin/openwrt-$NODE-$NODE_TYPE-squashfs.bin + $BIN_PATH/openwrt-$NODE-$NODE_TYPE-squashfs.bin ;; vbox) cp `ls -t $OPENWRT_PATH/bin/x86/*.vdi | head -1` \ - $TESTBED_PATH/bin/openwrt-$NODE-$NODE_TYPE.vdi + $BIN_PATH/openwrt-$NODE-$NODE_TYPE.vdi ;; esac } Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/classes/opkg/build Mon Apr 4 14:58:37 2011 (r2502) @@ -2,5 +2,5 @@ build_opkg(){ . "$PLUGIN_PATH/classes/generic/build" && build_generic - fakeroot "$CLASS_PATH/ipkg-build" "$NODE_PATH" "$TESTBED_PATH/bin" + fakeroot "$CLASS_PATH/ipkg-build" "$NODE_PATH" "$BIN_PATH" } Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/classes/ubuntu_live/build Mon Apr 4 14:58:37 2011 (r2502) @@ -2,21 +2,21 @@ build_ubuntu_live(){ IMG_SIZE=$(( $(du -sk $NODE_PATH | cut -f1)*2+1000 )) - IMG_FILE="$TESTBED_PATH/bin/$FULL_NAME.img" - #dd if=/dev/zero of="$TESTBED_PATH/bin/casper-sn.ext2" bs=512 count=$IMG_SIZE + IMG_FILE="$BIN_PATH/$FULL_NAME.img" + #dd if=/dev/zero of="$BIN_PATH/casper-sn.ext2" bs=512 count=$IMG_SIZE #dd if=/dev/zero of="$IMG_FILE" bs=512 count=$(( $IMG_SIZE+1000 )) #mke2fs -F "$IMG_FILE" - #mke2fs -F "$TESTBED_PATH/bin/casper-sn.ext2" + #mke2fs -F "$BIN_PATH/casper-sn.ext2" TMPDIR=$(mktemp -d) (cd "$NODE_PATH"; find . -print0 | cpio --quiet -o0 -H newc | gzip -9c > "$TMPDIR/casper-sn.cpio.gz") - #mount -o loop "$TESTBED_PATH/bin/casper-sn.ext2" "$TMPDIR" + #mount -o loop "$BIN_PATH/casper-sn.ext2" "$TMPDIR" cp -aT "$NODE_PATH" "$TMPDIR" #umount "$TMPDIR" #mount -o loop "$IMG_FILE" "$TMPDIR" - #mv "$TESTBED_PATH/bin/casper-sn.ext2" "$TMPDIR" + #mv "$BIN_PATH/casper-sn.ext2" "$TMPDIR" # umount "$TMPDIR" # VBoxManage convertfromraw "$IMG_FILE" "$TESTBED_PATH/$FULL_NAME".vdi - mkisofs -R -l -V "$FULL_NAME" -o "$TESTBED_PATH/bin/$FULL_NAME.iso" "$TMPDIR" + mkisofs -R -l -V "$FULL_NAME" -o "$BIN_PATH/$FULL_NAME.iso" "$TMPDIR" # ubuntu_live --build-path ~/build --change $TESTBED_PATH/PisaLive-tester_amd64.iso -o $TESTBED_PATH/$TESTBED_NAME-$NODE.iso -a amd64 $TESTBED_PATH/$TESTBED_NAME-$NODE-${VERSION}_all.deb } Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/extern/openwrt/build Mon Apr 4 14:58:37 2011 (r2502) @@ -8,14 +8,14 @@ cp $TESTBED_PATH/plugins/extern/openwrt/dot_config_$NODE_TYPE $OPENWRT_PATH/.config make V=99 > make.log cp $OPENWRT_PATH/bin/ar71xx/openwrt-ar71xx-wrt160nl-squashfs.bin \ - $TESTBED_PATH/bin/openwrt-$NODE-$NODE_TYPE-squashfs.bin + $BIN_PATH/openwrt-$NODE-$NODE_TYPE-squashfs.bin ;; vbox) cmp -s $TESTBED_PATH/plugins/extern/openwrt/dot_config_$NODE_TYPE $OPENWRT_PATH/.config || cp $TESTBED_PATH/plugins/extern/openwrt/dot_config_$NODE_TYPE $OPENWRT_PATH/.config make V=99 > make.log cp `ls -t $OPENWRT_PATH/bin/x86/*.vdi | head -1` \ - $TESTBED_PATH/bin/openwrt-$NODE-$NODE_TYPE.vdi + $BIN_PATH/openwrt-$NODE-$NODE_TYPE.vdi ;; esac done Modified: trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build ============================================================================== --- trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build Mon Apr 4 14:58:35 2011 (r2501) +++ trunk/tools/testbed/pisa-testbed_vms/plugins/extern/pisa/build Mon Apr 4 14:58:37 2011 (r2502) @@ -12,7 +12,7 @@ opkg|openwrt) cd "$OPENWRT_PATH" make package/pisa/install - cp bin/*/packages/pisa-* "$TESTBED_PATH/bin/" + cp bin/*/packages/pisa-* "$BIN_PATH/" ;; esac done -- This is the pisa developer mailing list. Please also subscribe to the main pisa list at: //www.freelists.org/list/pisa