Update groups for LCR, LSK builds and use linaro-lolliop branch for reference-lcr

Also include repo_seed_dir location

Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Change-Id: I3934909ddcda570b7f3d08bdd2ee8c4159d1ff77

15 files changed, 31 insertions, 19 deletions

diff --git a/aosp-master-vexpress-lsk b/aosp-master-vexpress-lsk
index 2c56a9f..68873ac 100644
--- a/aosp-master-vexpress-lsk
+++ b/aosp-master-vexpress-lsk
@@ -2,7 +2,7 @@ MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=master
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
 LOCAL_MANIFEST_BRANCH=linaro-master
-REPO_GROUPS="default,-device,-non-default,vexpress"
+REPO_GROUPS="default,-device,arm"
 PATCHSETS=AOSP-MASTER-EXPERIMENTAL-PATCHSET
 MAKE_JOBS=6
 BUILD_FS_IMAGE=1
diff --git a/armv8-aosp-master-juno-lsk b/armv8-aosp-master-juno-lsk
index ec4927b..9d9d56f 100644
--- a/armv8-aosp-master-juno-lsk
+++ b/armv8-aosp-master-juno-lsk
@@ -2,7 +2,7 @@ MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest.git
 MANIFEST_BRANCH=master
 MANIFEST_FILENAME=default.xml
 BUILD_FS_IMAGE=1
-REPO_GROUPS="default,-device,-non-default,juno"
+REPO_GROUPS="default,-device,arm"
 LOCAL_MANIFEST=http://android.git.linaro.org/git/platform/manifest.git
 LOCAL_MANIFEST_BRANCH=linaro-master
 PATCHSETS=AOSP-MASTER-EXPERIMENTAL-PATCHSET
@@ -27,3 +27,4 @@ SOURCE_OVERLAY="arm/20141112/vendor.tar.bz2"
 SOURCE_OVERLAY_ACCEPT_LICENSE=51722ba4ccc270bcd54cb360cb242798
 REWRITE_MANIFEST=0
 MAKE_TARGETS="selinuxtarballs"
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/armv8-aosp-master-juno-lsk-clang b/armv8-aosp-master-juno-lsk-clang
index 2ab8119..cc570e3 100644
--- a/armv8-aosp-master-juno-lsk-clang
+++ b/armv8-aosp-master-juno-lsk-clang
@@ -28,3 +28,4 @@ SOURCE_OVERLAY_ACCEPT_LICENSE=51722ba4ccc270bcd54cb360cb242798
 REWRITE_MANIFEST=0
 MAKE_TARGETS="selinuxtarballs"
 USE_CLANG_PLATFORM_BUILD=true
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/armv8-lsk b/armv8-lsk
index 9d8bb64..c831c3d 100644
--- a/armv8-lsk
+++ b/armv8-lsk
@@ -1,10 +1,10 @@
 MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-non-default,-device,vexpress"
+REPO_GROUPS="default,-device,lsk"
 TARGET_KERNEL_SOURCE=kernel/linaro/vexpress
 #PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
 LOCAL_MANIFEST=http://android.git.linaro.org/git/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
 TARGET_PRODUCT=fvp
 USE_JAVA_7=true
 BOOTLOADER_TYPE=uefi
@@ -20,3 +20,4 @@ LAVA_JOB_URL=http://people.linaro.org/~vishal.bhoj/armv8-lsk.json
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/armv8-lsk-3.14 b/armv8-lsk-3.14
index c900427..e07b853 100644
--- a/armv8-lsk-3.14
+++ b/armv8-lsk-3.14
@@ -1,6 +1,6 @@
 MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-non-default,-device,vexpress"
+REPO_GROUPS="default,-device,lsk"
 TARGET_KERNEL_SOURCE=kernel/linaro/vexpress
 MAKE_TARGETS="selinuxtarballs"
 #PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
@@ -20,3 +20,4 @@ LAVA_JOB_URL=http://people.linaro.org/~vishal.bhoj/armv8-lsk-3.14.json
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/lcr-member-fvp b/lcr-member-fvp
index 3ca7e4e..75054f4 100644
--- a/lcr-member-fvp
+++ b/lcr-member-fvp
@@ -1,6 +1,6 @@
 MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-non-default,fvp-armv8"
+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
@@ -26,3 +26,4 @@ SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
 SKIP_LICENSE_CHECK=1
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/lcr-member-juno b/lcr-member-juno
index d69e61a..623a8b8 100644
--- a/lcr-member-juno
+++ b/lcr-member-juno
@@ -1,6 +1,6 @@
 MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-device,-non-default,juno"
+REPO_GROUPS="default,-device,arm"
 BUILD_FS_IMAGE=1
 PATCHSETS=LOLLIPOP-MLCR-PATCHSET
 LOCAL_MANIFEST=ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git
@@ -50,3 +50,4 @@ 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
diff --git a/lcr-member-vexpress b/lcr-member-vexpress
index 17f19f7..a9f7f4e 100644
--- a/lcr-member-vexpress
+++ b/lcr-member-vexpress
@@ -2,7 +2,7 @@ MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
 LOCAL_MANIFEST=ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git
 LOCAL_MANIFEST_BRANCH=lor_ice_lolly_mr1
-REPO_GROUPS="default,-device,-non-default,vexpress"
+REPO_GROUPS="default,-device,arm"
 PATCHSETS=LOLLIPOP-MLCR-PATCHSET
 MAKE_JOBS=6
 BUILD_FS_IMAGE=1
@@ -41,3 +41,4 @@ SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
 SKIP_LICENSE_CHECK=1
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/lcr-reference-fvp b/lcr-reference-fvp
index 970a86f..5c19541 100644
--- a/lcr-reference-fvp
+++ b/lcr-reference-fvp
@@ -1,9 +1,9 @@
 MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-non-default,fvp-armv8"
+REPO_GROUPS="default,-device,arm"
 PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
 USE_LINARO_TOOLCHAIN=true
 MAKE_TARGETS="selinuxtarballs"
 TARGET_PRODUCT=fvp
@@ -21,3 +21,4 @@ LAVA_JOB_URL_1=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/lcr-reference-juno b/lcr-reference-juno
index b5062df..2792e41 100644
--- a/lcr-reference-juno
+++ b/lcr-reference-juno
@@ -1,10 +1,10 @@
 MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
-REPO_GROUPS="default,-device,-non-default,juno"
+REPO_GROUPS="default,-device,arm"
 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
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
 USE_LINARO_TOOLCHAIN=true
 LUNCH=juno-userdebug
 TARGET_PRODUCT=juno
@@ -49,3 +49,4 @@ SOURCE_OVERLAY_ACCEPT_LICENSE=51722ba4ccc270bcd54cb360cb242798
 REWRITE_MANIFEST=0
 TARGET_OUT_DIR=juno
 INIT_BOOTCHART=true
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/lcr-reference-vexpress b/lcr-reference-vexpress
index 1406aa5..fba74e1 100644
--- a/lcr-reference-vexpress
+++ b/lcr-reference-vexpress
@@ -1,8 +1,8 @@
 MANIFEST_REPO=git://android.git.linaro.org/platform/manifest.git
 MANIFEST_BRANCH=android-5.1.1_r4
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
-REPO_GROUPS="default,-device,-non-default,vexpress"
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
+REPO_GROUPS="default,-device,arm"
 PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
 MAKE_JOBS=6
 BUILD_FS_IMAGE=1
@@ -25,3 +25,4 @@ LAVA_JOB_URL_1=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/nexus7-5.0-gcc49-linaro b/nexus7-5.0-gcc49-linaro
index 56bfdb0..ad2d04f 100644
--- a/nexus7-5.0-gcc49-linaro
+++ b/nexus7-5.0-gcc49-linaro
@@ -1,7 +1,7 @@
 MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
 MANIFEST_BRANCH=android-5.1.1_r4
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
 USE_JAVA_7=true
 REPO_GROUPS="default,-device,-non-default,flo"
 MANIFEST_FILENAME=default.xml
diff --git a/nexus7-master-gcc51 b/nexus7-master-gcc51
index 07526ef..bb30cc1 100644
--- a/nexus7-master-gcc51
+++ b/nexus7-master-gcc51
@@ -9,5 +9,5 @@ MAKE_TARGETS=droidcore
 PATCHSETS="get-flo-blobs"
 USE_CLANG_PLATFORM_BUILD=true
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_toolchains
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
 TARGET_TOOLS_PREFIX=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro/bin/arm-linux-androideabi-
diff --git a/vexpress-lsk b/vexpress-lsk
index 4b6506a..93d4de5 100644
--- a/vexpress-lsk
+++ b/vexpress-lsk
@@ -1,8 +1,8 @@
 MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
 MANIFEST_BRANCH=android-5.0.2_r1
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
-LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0
-REPO_GROUPS="default,-device,-non-default,vexpress"
+LOCAL_MANIFEST_BRANCH=linaro-lollipop
+REPO_GROUPS="default,-device,lsk"
 #PATCHSETS=LOLLIPOP-EXPERIMENTAL-PATCHSET
 MAKE_JOBS=6
 BUILD_FS_IMAGE=1
@@ -26,3 +26,4 @@ LAVA_JOB_URL_2=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror
diff --git a/vexpress-lsk-3.14 b/vexpress-lsk-3.14
index 647f6fd..3e63b4b 100644
--- a/vexpress-lsk-3.14
+++ b/vexpress-lsk-3.14
@@ -2,7 +2,7 @@ MANIFEST_REPO=http://android.git.linaro.org/git/platform/manifest
 MANIFEST_BRANCH=android-5.1.1_r2
 LOCAL_MANIFEST=git://android.git.linaro.org/platform/manifest.git
 LOCAL_MANIFEST_BRANCH=linaro_android_5.0.0_lsk-3.14
-REPO_GROUPS="default,-device,-non-default,vexpress"
+REPO_GROUPS="default,-device,lsk"
 MAKE_JOBS=6
 BUILD_FS_IMAGE=1
 USE_JAVA_7=true
@@ -24,3 +24,4 @@ LAVA_JOB_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/v
 SUBMIT_JOB_FROM_URL=true
 LAVA_SUBMIT=1
 LAVA_SUBMIT_FATAL=0
+REPO_SEED_DIR=/home/buildslave/workspace/linaro-android_aosp-reference-mirror