summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2019-06-07 17:42:38 -0400
committerAndrew Morrow <acm@mongodb.com>2019-06-07 19:05:11 -0400
commit47e130f20f8381c09ab8f0b2ebbdd280341cbf25 (patch)
tree557200a662d318289ee2da286d69eacaf1736c48 /etc
parent982460e34cdd7cd5850ae7474343800a07d630fe (diff)
downloadmongo-47e130f20f8381c09ab8f0b2ebbdd280341cbf25.tar.gz
SERVER-39465 Run embedded android tests on a newer image
The older images seem unable to honor $ORIGIN. It doesn't matter in practice since origin processing is unnecessary for our real deployment situation in Android/Java. This is partial cherry-pick of 24d4a296aacf4acc981094f5cdf973ad62ab67fa
Diffstat (limited to 'etc')
-rw-r--r--etc/evergreen.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 0a70ba29216..01b4b93a0b1 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9522,7 +9522,7 @@ buildvariants:
enable_embedded_tests: android_emulator
setup_android_toolchain: true
android_toolchain_system_image_arch: "armeabi-v7a"
- android_system_image_version: "21"
+ android_system_image_version: "24"
android_toolchain_target_arch: "arm"
android_toolchain_api_version: "21"
dump_scons_config_on_failure: true
@@ -9605,7 +9605,7 @@ buildvariants:
enable_embedded_tests: android_emulator
setup_android_toolchain: true
android_toolchain_system_image_arch: "x86_64"
- android_system_image_version: "21"
+ android_system_image_version: "24"
android_toolchain_target_arch: "x86_64"
android_toolchain_api_version: "21"
dump_scons_config_on_failure: true
@@ -9621,7 +9621,7 @@ buildvariants:
compile_env: JAVA_HOME=/opt/java/jdk8/
setup_android_toolchain: true
android_toolchain_system_image_arch: "x86_64"
- android_system_image_version: 21
+ android_system_image_version: 24
android_toolchain_target_arch: "x86_64"
android_toolchain_api_version: "21"
tasks:
@@ -9636,7 +9636,7 @@ buildvariants:
compile_env: JAVA_HOME=/opt/java/jdk8/
setup_android_toolchain: true
android_toolchain_system_image_arch: "x86_64"
- android_system_image_version: 21
+ android_system_image_version: 24
android_toolchain_target_arch: "x86_64"
android_toolchain_api_version: "21"
tasks: