nextcloud
/
android
зеркало из https://github.com/nextcloud/android.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

scripts:uploadReport: Fix git token usage 

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey Vilas 2021-09-06 11:29:03 +02:00
Родитель 47689c938c
Коммит f3f14bfcc4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 2585783189A62105
4 изменённых файлов: 8 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
.drone.yml
Просмотреть файл

@ -26,11 +26,11 @@ steps:
- ./gradlew assembleGplayDebug - ./gradlew assembleGplayDebug
- scripts/wait_for_emulator.sh - scripts/wait_for_emulator.sh
- scripts/deleteOutdatedComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - 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 - ./gradlew installGplayDebugAndroidTest
- scripts/wait_for_server.sh "server" - scripts/wait_for_server.sh "server"
- scripts/deleteOutdatedComments.sh "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN - 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 - ./gradlew combinedTestReport
- name: notify - name: notify
image: drillster/drone-email image: drillster/drone-email

2
scripts/runAllScreenshotCombinations
Просмотреть файл

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

4
scripts/runCombinedTest.sh
Просмотреть файл

@ -18,7 +18,7 @@ scripts/wait_for_emulator.sh
stat=$? stat=$?
if [ ! $stat -eq 0 ]; then 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 fi
./gradlew installGplayDebugAndroidTest ./gradlew installGplayDebugAndroidTest
@ -27,7 +27,7 @@ scripts/wait_for_server.sh "server"
stat=$(( stat | $? )) stat=$(( stat | $? ))
if [ ! $stat -eq 0 ]; then 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 fi
./gradlew combinedTestReport ./gradlew combinedTestReport

7
scripts/uploadReport.sh
Просмотреть файл

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