1berry/nextcloud-android
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance uploadReport script

Browse Source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-06-10 06:56:17 +02:00
parent 5ba2aff146
commit 5aeba5e021
No known key found for this signature in database
GPG Key ID: 0E00D4D47D0C5AF7
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.yml
View File

@ -25,10 +25,10 @@ steps:
- ./gradlew assembleGplay - ./gradlew assembleGplay
- ./gradlew assembleGplayDebug - ./gradlew assembleGplayDebug
- scripts/wait_for_emulator.sh - scripts/wait_for_emulator.sh
- ./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_USERNAME $GIT_TOKEN
- ./gradlew installGplayDebugAndroidTest - ./gradlew installGplayDebugAndroidTest
- scripts/wait_for_server.sh "server" - scripts/wait_for_server.sh "server"
- ./gradlew createGplayDebugCoverageReport -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 -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 combinedTestReport - ./gradlew combinedTestReport
- name: notify - name: notify
image: drillster/drone-email image: drillster/drone-email
@ -104,10 +104,10 @@ steps:
- ./gradlew assembleGplay - ./gradlew assembleGplay
- ./gradlew assembleGplayDebug - ./gradlew assembleGplayDebug
- scripts/wait_for_emulator.sh - scripts/wait_for_emulator.sh
- ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master-Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
- ./gradlew installGplayDebugAndroidTest - ./gradlew installGplayDebugAndroidTest
- scripts/wait_for_server.sh "server" - scripts/wait_for_server.sh "server"
- ./gradlew createGplayDebugCoverageReport -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master-IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - ./gradlew createGplayDebugCoverageReport -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
- ./gradlew combinedTestReport - ./gradlew combinedTestReport
- curl -o codecov.sh https://codecov.io/bash - curl -o codecov.sh https://codecov.io/bash
- bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5 - bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
@ -187,7 +187,7 @@ steps:
- scripts/wait_for_emulator.sh - scripts/wait_for_emulator.sh
- ./gradlew installGplayDebugAndroidTest - ./gradlew installGplayDebugAndroidTest
- scripts/wait_for_server.sh "server" - scripts/wait_for_server.sh "server"
- ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable-Screenshot" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Screenshot" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
- name: notify - name: notify
image: drillster/drone-email image: drillster/drone-email
settings: settings:
@ -262,7 +262,7 @@ steps:
- scripts/wait_for_emulator.sh - scripts/wait_for_emulator.sh
- ./gradlew installGplayDebugAndroidTest - ./gradlew installGplayDebugAndroidTest
- scripts/wait_for_server.sh "server" - scripts/wait_for_server.sh "server"
- ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master-Screenshot" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - ./gradlew gplayDebugExecuteScreenshotTests -Pandroid.testInstrumentationRunnerArguments.annotation=com.owncloud.android.utils.ScreenshotTest || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" Screenshot" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
- name: notify - name: notify
image: drillster/drone-email image: drillster/drone-email
settings: settings:

13
scripts/uploadReport.sh
View File

@ -26,10 +26,11 @@ URL=https://nextcloud.kaminsky.me/remote.php/webdav/android-integrationTests
ID=$3 ID=$3
USER=$1 USER=$1
PASS=$2 PASS=$2
TYPE=$4 BRANCH=$4
PR=$5 TYPE=$5
GITHUB_USER=$6 PR=$6
GITHUB_PASSWORD=$7 GITHUB_USER=$7
GITHUB_PASSWORD=$8
REMOTE_FOLDER=$ID-$TYPE REMOTE_FOLDER=$ID-$TYPE
set -e set -e
@ -45,11 +46,11 @@ fi
if [ -e $FOLDER ]; then if [ -e $FOLDER ]; then
upload $FOLDER upload $FOLDER
else else
echo "$TYPE test failed, but no output was generated. Maybe a preliminary stage failed." echo "$BRANCH-$TYPE test failed, but no output was generated. Maybe a preliminary stage failed."
curl -u $GITHUB_USER:$GITHUB_PASSWORD \ curl -u $GITHUB_USER:$GITHUB_PASSWORD \
-X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments \ -X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments \
-d "{ \"body\" : \"$TYPE test failed, but no output was generated. Maybe a preliminary stage failed. \" }" -d "{ \"body\" : \"$BRANCH-$TYPE test failed, but no output was generated. Maybe a preliminary stage failed. \" }"
if [ -e build/reports/androidTests/connected/flavors/GPLAY ] ; then if [ -e build/reports/androidTests/connected/flavors/GPLAY ] ; then
TYPE="IT" TYPE="IT"