aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2016-02-04 04:40:28 -0500
committerNuoHan Qiao <qiaonuohan@cn.fujitsu.com>2016-02-04 04:40:28 -0500
commit57c86184027128e00543ae49f5f9b1b43208f2c4 (patch)
tree86474e4498c3f028dc289d237b58f901ac5c725b
parent84c8030a048569201baad84c975771f7a694ad06 (diff)
Fix the variable name for rootfs
Change-Id: Id2f99f94b16feecc772735ae848324348f231cfa Signed-off-by: NuoHan Qiao <qiaonuohan@cn.fujitsu.com>
-rw-r--r--jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh6
-rw-r--r--userdata/conf/boards/porter.board2
2 files changed, 4 insertions, 4 deletions
diff --git a/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh b/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
index 231867a..30ba2ee 100644
--- a/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
+++ b/jta-core/engine/tests/CIAT.build_deploy/build_deploy.sh
@@ -35,7 +35,7 @@ function deploy_image {
mkdir -p "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}"
sshpass -p "$BUILD_PASSWORD" $SERVER_SCP "$BUILD_USER"@"$BUILD_SERVERIP":"$BUILD_PATH/repoclone/$IMAGE_PATH/$UIMAGE" "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}"
sshpass -p "$BUILD_PASSWORD" $SERVER_SCP "$BUILD_USER"@"$BUILD_SERVERIP":"$BUILD_PATH/repoclone/$IMAGE_PATH/$DTB" "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}"
- sshpass -p "$BUILD_PASSWORD" $SERVER_SCP "$BUILD_USER"@"$BUILD_SERVERIP":"$BUILD_PATH/repoclone/$IMAGE_PATH/$IMAGE" "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}"
+ sshpass -p "$BUILD_PASSWORD" $SERVER_SCP "$BUILD_USER"@"$BUILD_SERVERIP":"$BUILD_PATH/repoclone/$IMAGE_PATH/$ROOTFS" "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}"
# deploy image to tftp/nfs server
sshpass -p "$BOOT_PASSWORD" $SERVER_SSH root@"$BOOT_SERVERIP" "mkdir -p $BOOT_TFTP_PATH/${BUILD_ID}; echo boot_num=${BUILD_ID} > $BOOT_TFTP_PATH/$BOOT_NUM_FILE"
@@ -43,8 +43,8 @@ function deploy_image {
sshpass -p "$BOOT_PASSWORD" $SERVER_SCP "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}/$DTB" root@"$BOOT_SERVERIP":"$BOOT_TFTP_PATH/${BUILD_ID}"
sshpass -p "$BOOT_PASSWORD" $SERVER_SSH root@"$BOOT_SERVERIP" "mkdir -p $BOOT_NFS_PATH/${BUILD_ID}"
- sshpass -p "$BOOT_PASSWORD" $SERVER_SCP "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}/$IMAGE" root@"$BOOT_SERVERIP":"$BOOT_NFS_PATH/${BUILD_ID}"
- sshpass -p "$BOOT_PASSWORD" $SERVER_SSH root@"$BOOT_SERVERIP" "cd $BOOT_NFS_PATH/${BUILD_ID}; tar xvf $IMAGE; touch new_image_flag.${BUILD_ID}"
+ sshpass -p "$BOOT_PASSWORD" $SERVER_SCP "$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}/$ROOTFS" root@"$BOOT_SERVERIP":"$BOOT_NFS_PATH/${BUILD_ID}"
+ sshpass -p "$BOOT_PASSWORD" $SERVER_SSH root@"$BOOT_SERVERIP" "cd $BOOT_NFS_PATH/${BUILD_ID}; tar xvf $ROOTFS; touch new_image_flag.${BUILD_ID}"
}
function reboot_to_new_image {
diff --git a/userdata/conf/boards/porter.board b/userdata/conf/boards/porter.board
index 746d647..d9561e9 100644
--- a/userdata/conf/boards/porter.board
+++ b/userdata/conf/boards/porter.board
@@ -51,7 +51,7 @@ BUILD_PATH="/compile/agl-demo/CIAT"
IMAGE_PATH="build/tmp/deploy/images"
UIMAGE="uImage"
DTB="uImage-r8a7791-porter.dtb"
-IMAGE="agl-demo-platform-porter.tar.bz2"
+ROOTFS="agl-demo-platform-porter.tar.bz2"
# configuration for tftp/nfs server
BOOT_SERVERIP="192.168.30.70"