scripts:uploadReport: Fix git token usage

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>

.drone.yml

@@ -26,11 +26,11 @@ steps:
       - ./gradlew assembleGplayDebug
       - scripts/wait_for_emulator.sh
       - scripts/deleteOutdatedComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-      - ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+      - ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Unit" $DRONE_PULL_REQUEST $GIT_TOKEN
       - ./gradlew installGplayDebugAndroidTest
       - scripts/wait_for_server.sh "server"
       - scripts/deleteOutdatedComments.sh "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-      - ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+      - ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST $GIT_TOKEN
       - ./gradlew combinedTestReport
   - name: notify
     image: drillster/drone-email

scripts/runAllScreenshotCombinations

@@ -43,7 +43,7 @@ do
         && scripts/deleteOutdatedComments.sh "$1-$darkMode-$color" "Screenshot" "$4" \
         "$GIT_USERNAME" "$GIT_TOKEN" \
         || resultCode=1 && scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" "$4" \
-        "$1-$darkMode-$color" "Screenshot" "$4" "$GIT_USERNAME" "$GIT_TOKEN"
+        "$1-$darkMode-$color" "Screenshot" "$4" "$GIT_TOKEN"
     fi
 done < scripts/screenshotCombinations
 

scripts/runCombinedTest.sh

@@ -18,7 +18,7 @@ scripts/wait_for_emulator.sh
 stat=$?
 
 if [ ! $stat -eq 0 ]; then
-    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_TOKEN
 fi
 
 ./gradlew installGplayDebugAndroidTest
@@ -27,7 +27,7 @@ scripts/wait_for_server.sh "server"
 stat=$(( stat | $? ))
 
 if [ ! $stat -eq 0 ]; then
-    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_TOKEN
 fi
 
 ./gradlew combinedTestReport

scripts/uploadReport.sh

@@ -41,8 +41,7 @@ upload() {
 #4: BRANCH (stable or master)
 #5: TYPE (IT or Unit)
 #6: DRONE_PULL_REQUEST
-#7: GIT_USERNAME
-#8: GIT_TOKEN
+#7: GITHUB_TOKEN
 
 URL=https://nextcloud.kaminsky.me/remote.php/webdav/android-integrationTests
 ID=$3
@@ -51,8 +50,8 @@ PASS=$2
 BRANCH=$4
 TYPE=$5
 PR=$6
-GITHUB_USER=$7
-GITHUB_PASSWORD=$8
+GITHUB_TOKEN="$7"
+
 REMOTE_FOLDER=$ID-$TYPE-$BRANCH-$(date +%H-%M)
 BRANCH_TYPE=$BRANCH-$TYPE