clean up submission to lava

1 files changed, 2 insertions, 52 deletions

diff --git a/jenkins/xen-image b/jenkins/xen-image
index b139eed..cbe083f 100644
--- a/jenkins/xen-image
+++ b/jenkins/xen-image
@@ -15,63 +15,13 @@ Files-Pattern: *
 License-Type: open
 EOF
 
-cat <<EOF > post_build_lava_parameters_${hwpack}
+cat <<EOF > post_build_lava_parameters
 HWPACK_JOB_NAME=${JOB_NAME}
 HWPACK_BUILD_NUMBER=${BUILD_NUMBER}
 HWPACK_FILE_NAME=`ls hwpack_linaro-${hwpack}*.tar.gz`
 DEVICE_TYPE=${hwpack}
-
-#IMAGE_URL=http://snapshots.linaro.org/ubuntu/images/xen/latest/xenlava-${hwpack}.img.gz
-##BUNDLE_STREAM_NAME=/private/team/linaro/virtualization/
-#BUNDLE_STREAM_NAME=/anonymous/xentest
-#BOOT_IMAGE_PARAMETERS_URL=${BUILD_URL}artifact/boot_image_parameters.json
-#DEPLOY_IMAGE_PARAMETERS_URL=${BUILD_URL}artifact/deploy_image_parameters.json
-#GIT_REPO is where test definitions come from. allows override of default qa/test-definitions
-#GIT_REPO=git://git.linaro.org/ci/xen-ci.git
-#LAVA_TEST_PLAN=xen
-
-#Use plain json file instead of above IMAGE_PARAMETERS and test definition
 CUSTOM_JSON_URL=https://git.linaro.org/ci/xen-ci.git/blob_plain/HEAD:/lava/xen-${hwpack}.json
 EOF
 
-cat post_build_lava_parameters_${hwpack}
+cat post_build_lava_parameters
 
-# Custom boot_linaro_image parameters
-cat << EOF > boot_image_parameters.json
-{
-         "boot_cmds": ["setenv kernel_addr_r 0x60000000",
-                      "setenv kernel_addr_load 0x5FFFFFC0",
-                      "setenv xen_addr_r 0x80200000",
-                      "setenv dtb_addr_r 0x42000000",
-                      "setenv initrd_addr_r 0x40100000",
-                      "setenv dtb_path /board.dtb",
-                      "setenv kernel_path /uImage",
-                      "setenv xen_path /xen",
-                      "setenv initrd_path /uInitrd",
-                      "fatload mmc 0:5 $xen_addr_r $xen_path",
-                      "fatload mmc 0:5 $kernel_addr_load $kernel_path",
-                      "fatload mmc 0:5 $dtb_addr_r $dtb_path",
-                      "fatload mmc 0:5 $initrd_addr_r $initrd_path",
-		      "setenv dom0_bootargs console=hvc0,38400n8 debug ignore_loglevel psci=enable clk_ignore_unused root=/dev/mmcblk1p6",
-		      "setenv xen_bootargs noreboot sync_console console=dtuart dtuart=/serial@12C20000 dom0_mem=512M",
-                      "fdt addr $dtb_addr_r",
-                      "fdt resize",
-                      "setenv bootargs $xen_bootargs",
-                      "fdt set /chosen xen,xen-bootargs \\\"$xen_bootargs\\\"",
-                      "fdt set /chosen xen,dom0-bootargs \\\"$dom0_bootargs\\\"",
-                      "fdt mknode /chosen modules",
-                      "fdt set /chosen/modules '#address-cells' <1>",
-                      "fdt set /chosen/modules '#size-cells' <1>",
-                      "fdt mknode /chosen/modules module@0",
-		      "fdt set /chosen/modules/module@0 compatible xen,linux-zimage xen,multiboot-module",
-                      "fdt set /chosen/modules/module@0 reg <$kernel_addr_r 0x00a00000>",
-                      "bootz $xen_addr_r $initrd_addr_r $dtb_addr_r"]
-}
-EOF
-
-# Custom deploy_linaro_image parameters
-cat << EOF > deploy_image_parameters.json
-{
-    "bootloadertype": "u_boot"
-}
-EOF