From a35519ffc306d4867bbcc7fac0257fc58fde5222 Mon Sep 17 00:00:00 2001
From: urpylka <urpylka@gmail.com>
Date: Wed, 7 Feb 2018 22:45:45 +0300
Subject: [PATCH] Replace 'image/' to 'deploy/' in CI-tools

---
 image/Jenkinsfile     | 12 ++++++------
 image/image-config.sh |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/image/Jenkinsfile b/image/Jenkinsfile
index 7ca842c2..e43979a9 100644
--- a/image/Jenkinsfile
+++ b/image/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
         RPI_IMAGE_NAME = '2017-11-29-raspbian-stretch-lite.img'
       }
       steps {
-        sh '$WORKSPACE/deploy/image-config.sh get_image $JENKINS_HOME $RPI_ZIP_NAME $RPI_DONWLOAD_URL $RPI_IMAGE_NAME $IMAGE_NAME'
+        sh '$WORKSPACE/image/image-config.sh get_image $JENKINS_HOME $RPI_ZIP_NAME $RPI_DONWLOAD_URL $RPI_IMAGE_NAME $IMAGE_NAME'
       }
     }
     stage('Resize FS') {
@@ -17,7 +17,7 @@ pipeline {
         SIZE = '7G'
       }
       steps {
-        sh '$WORKSPACE/deploy/image-config.sh resize_fs $SIZE $JENKINS_HOME $IMAGE_NAME $DEV_ROOTFS'
+        sh '$WORKSPACE/image/image-config.sh resize_fs $SIZE $JENKINS_HOME $IMAGE_NAME $DEV_ROOTFS'
       }
     }
     stage('Configure interfaces') {
@@ -25,7 +25,7 @@ pipeline {
         EXECUTE_FILE = 'iface.sh'
       }
       steps {
-        sh '$WORKSPACE/deploy/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/deploy/$EXECUTE_FILE'
+        sh '$WORKSPACE/image/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/image/$EXECUTE_FILE'
       }
     }
     stage('Install Apps') {
@@ -33,7 +33,7 @@ pipeline {
         EXECUTE_FILE = 'apps.sh'
       }
       steps {
-        sh '# $WORKSPACE/deploy/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/deploy/$EXECUTE_FILE'
+        sh '# $WORKSPACE/image/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/image/$EXECUTE_FILE'
       }
     }
     stage('Install ROS') {
@@ -41,7 +41,7 @@ pipeline {
         EXECUTE_FILE = 'ros.sh'
       }
       steps {
-        sh '# $WORKSPACE/deploy/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/deploy/$EXECUTE_FILE'
+        sh '# $WORKSPACE/image/image-config.sh execute $JENKINS_HOME/$IMAGE_NAME $PREFIX_PATH $DEV_ROOTFS $DEV_BOOT $WORKSPACE/image/$EXECUTE_FILE'
       }
     }
     stage('Publish image') {
@@ -49,7 +49,7 @@ pipeline {
         CONFIG_FILE = 'coex-ci.conf'
       }
       steps {
-        sh '$WORKSPACE/deploy/image-config.sh publish_image $JENKINS_HOME $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY'
+        sh '$WORKSPACE/image/image-config.sh publish_image $JENKINS_HOME $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY'
       }
     }
   }
diff --git a/image/image-config.sh b/image/image-config.sh
index 134a3d7d..1580ea67 100755
--- a/image/image-config.sh
+++ b/image/image-config.sh
@@ -88,9 +88,9 @@ publish_image() {
   echo 'Zip image' \
     && zip $1/$2.zip $1/$2 \
     && echo 'Upload image' \
-    && local IMAGE_LINK=$($3/deploy/yadisk.py $1/$4 $1/$2.zip) \
+    && local IMAGE_LINK=$($3/image/yadisk.py $1/$4 $1/$2.zip) \
     && local IMAGE_SIZE=$(du -sh $1/$2.zip | awk '{ print $1 }') \
-    && $3/deploy/git_release.py $1/$4 $5 $6 $2 $IMAGE_LINK $IMAGE_SIZE
+    && $3/image/git_release.py $1/$4 $5 $6 $2 $IMAGE_LINK $IMAGE_SIZE
 }
 
 publish_image2() {
@@ -104,7 +104,7 @@ publish_image2() {
   echo 'Zip image' \
     && zip $1/$2.zip $1/$2 \
     && echo 'Upload image' \
-    && local IMAGE_LINK=$($3/deploy/yadisk.py $1/$4 $1/$2.zip) \
+    && local IMAGE_LINK=$($3/image/yadisk.py $1/$4 $1/$2.zip) \
     && local IMAGE_SIZE=$(du -sh $1/$2.zip | awk '{ print $1 }') \
     && local NEW_RELEASE_BODY="### Download\n* [$2.zip]($IMAGE_LINK) ($IMAGE_SIZE)\n\n$6" \
     && local DATA="{ \"body\":\"$NEW_RELEASE_BODY\" }" \