From f901167009850907d731015a969cfbda15b63446 Mon Sep 17 00:00:00 2001
From: urpylka <urpylka@gmail.com>
Date: Tue, 24 Apr 2018 13:48:54 +0300
Subject: [PATCH] image_builder: replace ini to json, requests to curl

Signed-off-by: Artem Smirnov <urpylka@gmail.com>
---
 image_builder/git_release.py      | 39 ---------------------------
 image_builder/image_config.sh     | 45 +++++++------------------------
 image_builder/jenkinsfile-release |  2 +-
 3 files changed, 11 insertions(+), 75 deletions(-)
 delete mode 100755 image_builder/git_release.py

diff --git a/image_builder/git_release.py b/image_builder/git_release.py
deleted file mode 100755
index 096eabaa..00000000
--- a/image_builder/git_release.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Simple github release body-editor
-# @urpylka Artem Smirnov
-#
-# Use:
-# python git_release.py CONFIG_FILE RELEASE_ID RELEASE_BODY
-#
-
-
-from ConfigParser import SafeConfigParser
-import requests, sys, urllib
-
-def json_wrapper(image_name, image_link, image_size, old_text):
-    # Don't need for Jenkins plugin
-    #old_text = urllib.unquote_plus(old_text)
-    buffer = "### Download\n* [" + image_name + ".zip](" + image_link + ") (" + image_size + ")\n\n" + old_text
-    js = {}
-    js["body"] = buffer
-    return js
-
-
-def main():
-
-    cfgParser = SafeConfigParser()
-    cfgParser.read(sys.argv[1])
-
-    js = json_wrapper(sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[3])
-
-    r = requests.patch(cfgParser.get('github','url') + sys.argv[2], json=js, auth=(cfgParser.get('github','login'), cfgParser.get('github','password')))
-
-    if r.status_code == 200:
-        print("Message has been successfully added!")
-    else:
-        return 1
-
-if __name__ == '__main__':
-    main()
diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh
index 6f7367ca..a9a17161 100755
--- a/image_builder/image_config.sh
+++ b/image_builder/image_config.sh
@@ -79,31 +79,7 @@ resize_fs() {
   set -e
 }
 
-publish_image_python() {
-
-# STATIC FUNCTION
-# TEMPLATE: publish_image_python $BUILD_DIR $IMAGE_NAME $WORKSPACE $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"
-
-  echo 'Zip image'
-  if [ ! -e "$1/$2.zip" ];
-  then cd $1 && zip $2.zip $2
-  fi
-
-  echo 'Upload image' \
-    && local IMAGE_LINK=$($3/image_builder/yadisk.py $1/$4 $1/$2.zip)
-
-  echo 'Meashuring size of zip-image' \
-    && local IMAGE_SIZE=$(du -sh $1/$2.zip | awk '{ print $1 }')
-
-  echo 'Post message to GH' \
-    && $3/image_builder/git_release.py $1/$4 $5 $6 $2 $IMAGE_LINK $IMAGE_SIZE
-#    echo "Fake publish"
-}
-
-publish_image_bash() {
+publish_image() {
 
 # STATIC FUNCTION
 # TEMPLATE: publish_image_bash $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
@@ -117,15 +93,18 @@ publish_image_bash() {
   fi
 
   echo 'Upload image' \
-    && local IMAGE_LINK=$($3/image_builder/yadisk.py $1/$4 $1/$2.zip)
+    && local IMAGE_LINK=$($3/image_builder/yadisk.py $4 $1/$2.zip)
 
   echo 'Meashuring size of zip-image' \
     && local IMAGE_SIZE=$(du -sh $1/$2.zip | awk '{ print $1 }')
 
   echo 'Post message to GH' \
-    && local NEW_RELEASE_BODY="### Download\n* [$2.zip]($IMAGE_LINK) ($IMAGE_SIZE)\n\n$6" \
-    && local DATA="{ \"body\":\"$NEW_RELEASE_BODY\" }" \
-    && curl -d "$(echo $DATA)" -u "LOGIN:PASS" --request PATCH https://api.github.com/repos/ONWER/REPO/releases/$5
+    local NEW_RELEASE_BODY="### Download\n* [$2.zip]($IMAGE_LINK) ($IMAGE_SIZE)\n\n$6"
+    local DATA="{ \"body\":\"$NEW_RELEASE_BODY\" }"
+    local GH_LOGIN=$(cat $4 | jq 'github.login')
+    local GH_PASS=$(cat $4 | jq 'github.password')
+    local GH_URL=$(cat $4 | jq 'github.url')
+    curl -d "$(echo $DATA)" -u "$GH_LOGIN:$GH_PASS" --request PATCH $GH_URL$5
 }
 
 burn_image() {
@@ -399,12 +378,8 @@ case "$1" in
     resize_fs $2 $3 $4 $5;;
 
   publish_image)
-  # publish_image_python $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
-    publish_image_python $2 $3 $4 $5 $6 $7;;
-
-  publish_image_bash)
-  # publish_image_bash $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
-    publish_image_bash $2 $3 $4 $5 $6 $7;;
+  # publish_image $BUILD_DIR $IMAGE_NAME $WORKSPACE $CONFIG_FILE $RELEASE_ID $RELEASE_BODY
+    publish_image $2 $3 $4 $5 $6 $7;;
 
   execute)
   # execute $IMAGE $MOUNT_POINT $EXECUTE_FILE ...
diff --git a/image_builder/jenkinsfile-release b/image_builder/jenkinsfile-release
index 91a36f95..14b9fbb0 100644
--- a/image_builder/jenkinsfile-release
+++ b/image_builder/jenkinsfile-release
@@ -31,7 +31,7 @@ pipeline {
         CONFIG_FILE = 'coex-ci.conf'
       }
       steps {
-        sh "$WORKSPACE/image_builder/image_config.sh publish_image ${params.BUILD_DIR} ${params.IMAGE_NAME} $WORKSPACE $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 ${params.BUILD_DIR}/$CONFIG_FILE ${params.GWBT_RELEASE_ID} \'${params.GWBT_RELEASE_BODY}\'"
       }
     }
   }