From 60571035f1f3f8702fa56955b635bb6de9cf8e4d Mon Sep 17 00:00:00 2001
From: Andrew Kerr <andrew.kerr@netapp.com>
Date: Thu, 19 Dec 2019 10:32:16 -0500
Subject: [PATCH] Fix deployment scripts

---
 Jenkinsfile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ed971d8d..e4a7ba773 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2401,7 +2401,7 @@ def _build_trident(String name, String ssh_options, Map spec) {
           )
 
           // Tag the release
-          def release_name = 'v' + env.TRIDENT_VERSION
+          def release_name = 'v' + tag
           try {
             echo "Creating script to tag the release"
 
@@ -2462,6 +2462,7 @@ def _build_trident(String name, String ssh_options, Map spec) {
 
           sh (label: "Sleep", script: "sleep 1")
 
+          // Upload tools repo
           _scp(
             ssh_options,
             'root',
@@ -2473,6 +2474,18 @@ def _build_trident(String name, String ssh_options, Map spec) {
             true
           )
 
+           // Upload github token
+           _scp(
+             ssh_options,
+             'root',
+             ip_address,
+             "${env.HOME}/.github.py",
+             ".",
+             true,
+             true,
+             true
+           )
+
           if (env.BUILD_TYPE == 'stable') {
 
             def tarball = "trident-installer-${env.TRIDENT_VERSION}.tar.gz"
@@ -2524,7 +2537,7 @@ def _build_trident(String name, String ssh_options, Map spec) {
                 "--repository $env.TRIDENT_PUBLIC_GITHUB_REPO " +
                 "--user $env.GITHUB_USERNAME " +
                 "--prerelease " +
-                "--release-name ${release_name}-${env.BUILD_TYPE}.${env.TRIDENT_REVISION} " +
+                "--release-name $release_name " +
                 "--release-hash $commit " +
                 "--release-tarball $tarball'"
             )