瀏覽代碼

Drone: don't run unit tests

Done in GH actions now

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 2 年之前
父節點
當前提交
f572176e4c
共有 2 個文件被更改,包括 1 次插入14 次删除
  1. 0 3
      .drone.yml
  2. 1 11
      scripts/runCombinedTest.sh

+ 0 - 3
.drone.yml

@@ -24,13 +24,10 @@ steps:
       - ./gradlew assembleGplay
       - ./gradlew assembleGplayDebug
       - scripts/wait_for_emulator.sh
-      - scripts/deleteOldComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $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/deleteOldComments.sh "stable" "IT" $DRONE_PULL_REQUEST $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
 
 services:
   - name: server

+ 1 - 11
scripts/runCombinedTest.sh

@@ -7,32 +7,22 @@ LOG_USERNAME=$4
 LOG_PASSWORD=$5
 DRONE_BUILD_NUMBER=$6
 
-scripts/deleteOldComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_TOKEN
 scripts/deleteOldComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_TOKEN
 
 ./gradlew assembleGplay
 ./gradlew assembleGplayDebug
 
 scripts/wait_for_emulator.sh
-./gradlew jacocoTestGplayDebugUnitTestReport 
-stat=$?
-
-if [ ! $stat -eq 0 ]; then
-    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_TOKEN
-fi
 
 ./gradlew installGplayDebugAndroidTest
 scripts/wait_for_server.sh "server"
 ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest
-stat=$(( stat | $? ))
+stat=$?
 
 if [ ! $stat -eq 0 ]; then
     bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_TOKEN
 fi
 
-./gradlew combinedTestReport
-stat=$(( stat | $? ))
-
 curl -Os https://uploader.codecov.io/latest/linux/codecov
 chmod +x codecov
 ./codecov -t fc506ba4-33c3-43e4-a760-aada38c24fd5