更新 .gitlab-ci.yml

634bbdba · 宋海霞 · a6ac424e · 634bbdba
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:

 before_script:
  - chmod +x ./gradlew
-  - chmod +x ./waitfinish.sh
+#  - chmod +x ./waitfinish.sh

 stages:
  - code-analysis
@@ -20,14 +20,14 @@ stages:
 .codecode-runner: &codecode-runner
  tags:
    - ubuntu-16.04
-    - short-job
-    - staging
+    - long-job
+    - android-app
    
 .codecode-analysis-runner: &codecode-analysis-runner
  tags:
    - ubuntu-16.04
-    - short-job
-    - staging
+    - long-job
+    - android-app
 #    - code-analysis

    
@@ -38,7 +38,7 @@ code-analysis:
  script:
    - ./gradlew assembleDebug --offline
    - sonar-scanner -Dsonar.projectKey=ProjectKey-$CI_PROJECT_ID -Dsonar.projectName=$CI_PROJECT_NAME -Dsonar.links.homepage=$CI_PROJECT_URL -Dsonar.host.url=$SONAR_URL -Dsonar.login=$SONAR_LOGIN -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME -Dsonar.gitlab.project_id=$CI_PROJECT_ID -Dsonar.gitlab.url=$CODECODE_PROTOCOL$CODECODE_DOMAIN
-    - ./waitfinish.sh
+#    - ./waitfinish.sh
  allow_failure: true
  only:
    - master
@@ -59,7 +59,8 @@ case1:
      echo "==========================================="
      
    - avdmanager create avd --force --name "test" --device "pixel" --package "system-images;android-30;google_apis;x86" > /dev/null
-    - emulator -memory 4096 -timezone Asia/Shang_Hai -avd "test" -no-boot-anim -no-window -gpu swiftshader_indirect -accel on -noaudio -no-snapshot-save -dns-server 8.8.8.8,8.8.4.4 -netfast -nojni & 
+#    - emulator -memory 4096 -timezone Asia/Shang_Hai -avd "test" -no-boot-anim -no-window -gpu swiftshader_indirect -accel on -noaudio -no-snapshot-save -dns-server 8.8.8.8,8.8.4.4 -netfast -nojni & 
+    - emulator -memory 4096 -timezone Asia/Shang_Hai -avd "test" -no-boot-anim -no-window -gpu host -accel on -noaudio -no-snapshot-save -dns-server 8.8.8.8,8.8.4.4 -netfast -nojni & 
    - /android-wait-for-emulator.sh 20
    - adb shell am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS
    - sleep 3; adb shell input keyevent 22