Merge branch 'master' of https://android.git.linaro.org/git/android-build-configs

4 files changed, 36 insertions, 9 deletions

diff --git a/lcr-member-juno b/lcr-member-juno
index 82de88a..b761ba3 100644
--- a/lcr-member-juno
+++ b/lcr-member-juno
@@ -40,6 +40,8 @@ LAVA_JOB_URL_18=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/androi
 LAVA_JOB_URL_19=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-vellamo3.json
 LAVA_JOB_URL_20=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-applications.json
 LAVA_JOB_URL_21=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-benchmarks.json
+LAVA_JOB_URL_22=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-workloads.json
+LAVA_JOB_URL_23=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-workloads-audio.json
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
diff --git a/lcr-reference-juno b/lcr-reference-juno
index 415a8eb..b3ac85c 100644
--- a/lcr-reference-juno
+++ b/lcr-reference-juno
@@ -40,6 +40,8 @@ LAVA_JOB_URL_18=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/androi
 LAVA_JOB_URL_19=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-vellamo3.json
 LAVA_JOB_URL_20=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-applications.json
 LAVA_JOB_URL_21=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-benchmarks.json
+LAVA_JOB_URL_22=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-workloads.json
+LAVA_JOB_URL_23=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/armv8-android-juno-lsk/template-wa-workloads-audio.json
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
diff --git a/nexus10-aosp-master b/nexus10-aosp-master
new file mode 100644
index 0000000..33cb857
--- /dev/null
+++ b/nexus10-aosp-master
@@ -0,0 +1,22 @@
+MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
+MANIFEST_BRANCH=master
+USE_JAVA_7=true
+MANIFEST_FILENAME=default.xml
+SOURCE_OVERLAY="manta/android-5.1/build-info.tar.bz2"
+LEGACY_USE_JAVA6=true
+LUNCH=aosp_manta-userdebug
+TARGET_PRODUCT=aosp_manta
+TARGET_BUILD_VARIANT=userdebug
+MAKE_TARGETS=droidcore
+MAKE_JOBS=8
+RAMDISK_SIZE=0
+LINARO_BUILD_SPEC=nexus10-linaro
+LAVA_JOB_URL=http://people.linaro.org/~zhizhou.tian/nexus10.json
+SUBMIT_JOB_FROM_TEST_PLAN=false
+SUBMIT_JOB_FROM_URL=true
+LAVA_SUBMIT=1
+LAVA_SUBMIT_FATAL=0
+LAVA_SUBMIT=1
+LAVA_SUBMIT_FATAL=0
+TARGET_PRODUCT=aosp_manta
+LAVA_SERVER=http://nwdrone.com/RPC2/
diff --git a/premerge-ci/armv8-android-juno-lsk b/premerge-ci/armv8-android-juno-lsk
index b3da8a0..f664e63 100644
--- a/premerge-ci/armv8-android-juno-lsk
+++ b/premerge-ci/armv8-android-juno-lsk
@@ -1,11 +1,10 @@
-MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
-MANIFEST_BRANCH=android-5.1.1_r2
-REPO_GROUPS="default,-device,-non-default,juno"
-BUILD_FS_IMAGE=1
-PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
-LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
-TARGET_TOOLS_PREFIX=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro/bin/aarch64-linux-android-
+MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
+MANIFEST_BRANCH=android-5.1.1_r4
+REPO_GROUPS="default,-device,arm"
+PATCHSETS=LOLLIPOP-MLCR-PATCHSET
+LOCAL_MANIFEST=ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git
+LOCAL_MANIFEST_BRANCH=lor_ice_lolly_mr1
+USE_LINARO_TOOLCHAIN=true
 LUNCH=juno-userdebug
 TARGET_PRODUCT=juno
 SUBMIT_JOB_FROM_TEST_PLAN=false
@@ -23,8 +22,10 @@ SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
 LINARO_BUILD_SPEC=armv8-android-juno-lsk
-SOURCE_OVERLAY="arm/20150612/vendor.tar.bz2"
+SOURCE_OVERLAY="arm/20150612-members-only/vendor.tar.bz2"
 SOURCE_OVERLAY_ACCEPT_LICENSE=51722ba4ccc270bcd54cb360cb242798
 REWRITE_MANIFEST=0
 TARGET_OUT_DIR=juno
 INIT_BOOTCHART=true
+SKIP_LICENSE_CHECK=1
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror