From c945bb9d03bd60ba7c674252e7914a398f74ff28 Mon Sep 17 00:00:00 2001
From: urpylka <urpylka@gmail.com>
Date: Tue, 24 Apr 2018 14:09:43 +0300
Subject: [PATCH] image_builder: made var YA_SCRIPT

Signed-off-by: Artem Smirnov <urpylka@gmail.com>
---
 image_builder/image_config.sh     | 6 +++---
 image_builder/jenkinsfile-release | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh
index 8350ef80..8bdbfc9e 100755
--- a/image_builder/image_config.sh
+++ b/image_builder/image_config.sh
@@ -82,7 +82,7 @@ resize_fs() {
 publish_image() {
 
 # STATIC FUNCTION
-# TEMPLATE: publish_image_bash $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
+# TEMPLATE: publish_image_bash $BUILD_DIR $IMAGE_NAME $YA_SCRIPT $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
 
 # https://developer.github.com/v3/repos/releases/
 #RELEASE_BODY="### Changelog\n* Add /boot/cmdline.txt net.ifnames=0 https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/\n* Updated cophelper\n* Installed copstat"
@@ -93,7 +93,7 @@ publish_image() {
   fi
 
   echo 'Upload image' \
-    && local IMAGE_LINK=$($3/image_builder/yadisk.py $4 $1/$2.zip)
+    && local IMAGE_LINK=$($3 $4 $1/$2.zip)
 
   echo 'Meashuring size of zip-image' \
     && local IMAGE_SIZE=$(du -sh $1/$2.zip | awk '{ print $1 }')
@@ -378,7 +378,7 @@ case "$1" in
     resize_fs $2 $3 $4 $5;;
 
   publish_image)
-  # publish_image $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
+  # publish_image $BUILD_DIR $IMAGE_NAME $YA_SCRIPT $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
     publish_image $2 $3 $4 $5 $6 $7;;
 
   execute)
diff --git a/image_builder/jenkinsfile-release b/image_builder/jenkinsfile-release
index 14b9fbb0..a1eabbe5 100644
--- a/image_builder/jenkinsfile-release
+++ b/image_builder/jenkinsfile-release
@@ -29,9 +29,10 @@ pipeline {
       when { environment name: 'GWBT_TRIGGER', value: 'release' }
       environment {
         CONFIG_FILE = 'coex-ci.conf'
+        YA_SCRIPT = 'image_builder/yadisk.py'
       }
       steps {
-        sh "$WORKSPACE/image_builder/image_config.sh publish_image ${params.BUILD_DIR} ${params.IMAGE_NAME} $WORKSPACE ${params.BUILD_DIR}/$CONFIG_FILE ${params.GWBT_RELEASE_ID} \'${params.GWBT_RELEASE_BODY}\'"
+        sh "$WORKSPACE/image_builder/image_config.sh publish_image ${params.BUILD_DIR} ${params.IMAGE_NAME} $WORKSPACE/$YA_SCRIPT ${params.BUILD_DIR}/$CONFIG_FILE ${params.GWBT_RELEASE_ID} \'${params.GWBT_RELEASE_BODY}\'"
       }
     }
   }