From e6b4553ce15d1cdac0f8276058348bb1f52cf683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Wed, 8 Aug 2018 11:00:34 -0400
Subject: [PATCH] fix git tag push credentials, needs to use token instead of
 pass

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
---
 ci/Jenkinsfile.nightly_fastlane       |  2 +-
 ci/Jenkinsfile.release                |  2 +-
 ci/Jenkinsfile.upload_release_android | 13 +------------
 ci/Jenkinsfile.upload_release_ios     | 13 +------------
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/ci/Jenkinsfile.nightly_fastlane b/ci/Jenkinsfile.nightly_fastlane
index 5d75a6075a..ce904edda8 100644
--- a/ci/Jenkinsfile.nightly_fastlane
+++ b/ci/Jenkinsfile.nightly_fastlane
@@ -50,7 +50,7 @@ timeout(90) {
         stage('Tag Build') {
           withCredentials([[
             $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
+            credentialsId: 'status-im-auto',
             usernameVariable: 'GIT_USER',
             passwordVariable: 'GIT_PASS'
           ]]) {
diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release
index b5eb51aa4e..a7fd37b27b 100644
--- a/ci/Jenkinsfile.release
+++ b/ci/Jenkinsfile.release
@@ -51,7 +51,7 @@ timeout(90) {
         stage('Tag Build') {
           withCredentials([[
             $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
+            credentialsId: 'status-im-auto',
             usernameVariable: 'GIT_USER',
             passwordVariable: 'GIT_PASS'
           ]]) {
diff --git a/ci/Jenkinsfile.upload_release_android b/ci/Jenkinsfile.upload_release_android
index de63a6a481..bc245d356e 100644
--- a/ci/Jenkinsfile.upload_release_android
+++ b/ci/Jenkinsfile.upload_release_android
@@ -55,7 +55,7 @@ timeout(90) {
         stage('Tag Build') {
           withCredentials([[
             $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
+            credentialsId: 'status-im-auto',
             usernameVariable: 'GIT_USER',
             passwordVariable: 'GIT_PASS'
           ]]) {
@@ -81,17 +81,6 @@ timeout(90) {
         stage('Deploy (Android)') {
           sh ('bundle exec fastlane android release')
         }
-
-        stage('Push build tag') {
-          withCredentials([[
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
-            usernameVariable: 'GIT_USER',
-            passwordVariable: 'GIT_PASS'
-          ]]) {
-            sh ('git push --tags https://${GIT_USER}:${GIT_PASS}@github.com/status-im/status-react --tags')
-          }
-        }
       } catch (e) {
         slackSend color: 'bad', message: 'Release build failed uploading to the Play Market. ' + env.BUILD_URL
         throw e
diff --git a/ci/Jenkinsfile.upload_release_ios b/ci/Jenkinsfile.upload_release_ios
index 3c272b4af5..904ba3c52c 100644
--- a/ci/Jenkinsfile.upload_release_ios
+++ b/ci/Jenkinsfile.upload_release_ios
@@ -54,7 +54,7 @@ timeout(90) {
         stage('Tag Build') {
           withCredentials([[
             $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
+            credentialsId: 'status-im-auto',
             usernameVariable: 'GIT_USER',
             passwordVariable: 'GIT_PASS'
           ]]) {
@@ -87,17 +87,6 @@ timeout(90) {
         stage('Deploy (iOS)') {
           sh ('bundle exec fastlane ios release')
         }
-
-        stage('Push build tag') {
-          withCredentials([[
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'jenkins-status-im',
-            usernameVariable: 'GIT_USER',
-            passwordVariable: 'GIT_PASS'
-          ]]) {
-            sh ('git push --tags https://${GIT_USER}:${GIT_PASS}@github.com/status-im/status-react --tags')
-          }
-        }
       } catch (e) {
         slackSend color: 'bad', message: 'Release build failed uploading to iTunes Connect. ' + env.BUILD_URL
         throw e