jenkins-bot has submitted this change and it was merged.

Change subject: Android: upgrade emulator to API 24
......................................................................


Android: upgrade emulator to API 24

• Upgrade the Android emulator to API 24, Nougat. Per T147010, API 15 is
  no longer an offered emulator in Android Studio and app support will
  soon be dropped.

  The latest API was chosen to offer the most functionality to the new
  screenshot diff tests which are highly device dependent. The downsides
  are that all other instrumentation tests won't run on the oldest APIs
  and the newest emulator seems significantly slower than API 15.
  Additionally, the plugin tooling doesn't seem to offer experimental
  multiprocessor support which might have improved performance.

  Recent emulators do not seem to draw correctly when an X server is not
  available. Additionally, all emulators that connect to an X server
  seem to require GLX extensions which is why Xpra cannot be used. This
  patch requires an updated Puppet configuration as described in the
  dependencies.

• Add screenshot differencing tests.

• Remove WebView dependent tests by specifying that only @Small
  annotated tests be executed. The current version of the Android SDK
  tooling supported by the Android Emulator Jenkins Plugin with any
  recent emulator requires a physical GPU[0] unavailable in a
  virtualized instance. The API 15 emulator used a very dated WebView
  that didn't suffer this limitation and only received updates with the
  platform (never).

• Fix poll branch. origin/master seemed to be polled correctly but the
  wrong branch was used when actually building,
  refs/remotes/origin/origin/master^{commit}.

• Remove setup script which unlocked the screen, waited until the
  emulator was fully booted and connected to the internet, and reset the
  date. This no longer seems necessary and appears to be at least
  partially handled by the Android Emulator Jenkins Plugin[1] for API
  23+.

[0] https://code.google.com/p/android/issues/detail?id=189040
[1] 
https://wiki.jenkins-ci.org/display/JENKINS/Android+Emulator+Plugin#AndroidEmulatorPlugin-Version2.14%28April8%2C2016%29

Bug: T133183
Bug: T147010
Change-Id: I974ea54c5035b6cc08edd2f17ebdcd130770c56f
---
M jjb/mobile.yaml
1 file changed, 15 insertions(+), 16 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Niedzielski: Verified; Looks good to me, approved



diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml
index 2bddba7..f97d4ee 100644
--- a/jjb/mobile.yaml
+++ b/jjb/mobile.yaml
@@ -69,33 +69,32 @@
     triggers:
      - pollscm:
         cron: '@hourly'
+    parameters:
+     - string:
+         name: 'DISPLAY'
+         default: ':95'
     scm:
      - git:
         url: https://phabricator.wikimedia.org/diffusion/APAW
         branches:
-          - origin/master # Hardcode to branch so pollscm works properly.
+          - master # Hardcode to branch so pollscm works properly.
     wrappers:
-     - android-emulator:
-         os: android-15
-         target-abi: x86
-         wipe: false
-         delete: false
-         snapshot: true
-         commandline-options: '-noaudio'
+     - android-emulator: # api 24 on a nexus s because 1440x2560 at 560 PPI 
doesn't boot in CI
+         os: android-24
          screen-density: 240
-         screen-resolution: WVGA
-         locale: en_US
+         target-abi: x86
+         show-window: true
          hardware-properties:
-             vm.heapSize: 512
+            # Required for emulators to terminate: 
https://wiki.jenkins-ci.org/display/JENKINS/Android+Emulator+Plugin#AndroidEmulatorPlugin-Knownissues
+            hw.audioInput: no
     builders:
      - shell: |
-         ./gradlew clean assembleAlphaRelease packageAlphaReleaseAndroidTest
-         scripts/adb-setup.bash
-         ./gradlew spoonAlphaReleaseAndroidTest
+         ./gradlew clean testAllAlphaRelease 
-Pandroid.testInstrumentationRunnerArguments.size=small
+         scripts/diff-screenshots
     publishers:
      - archive:
-         # Capture generated .apk, ProGuard mappings, and Spoon results
-         artifacts: '**/build/outputs/**,**/build/spoon/**'
+         # Capture generated .apk, ProGuard mappings, Spoon results, and 
screenshot difference results
+         artifacts: 
'**/build/outputs/**,**/build/spoon/**,**/build/screenshots/**,**/build/screenshots-diff/**'
      - junit:
          results: '**/build/spoon/**/*.xml'
      - irc-android-ci

-- 
To view, visit https://gerrit.wikimedia.org/r/314788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I974ea54c5035b6cc08edd2f17ebdcd130770c56f
Gerrit-PatchSet: 7
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to