try: -b o -p android-partner-sample1 -u none -t none
authorJordan Lund <jlund@mozilla.com>
Thu, 24 Sep 2015 21:32:53 -0700
changeset 593988 d9143f16bd98be916f1794249ecbe587fe50a357
parent 593938 3e194220bcd1b19b84d22263fb471beba152a055
child 627158 cc29c9ef40345b8fcb592bf4a672bfd4ce1d6fee
push id90230
push userjlund@mozilla.com
push dateFri, 25 Sep 2015 06:40:11 +0000
treeherdertry@d9143f16bd98 [default view] [failures only]
milestone44.0a1
try: -b o -p android-partner-sample1 -u none -t none * defines extra checkout partner repo in decision task-graph * uses my user docker repo that has updated checkout-sources.sh file * fixes bang typo in extra_repo expansion * use sha not master * fixes typo of not incl dest dir as first arg
testing/docker/desktop-build/REGISTRY
testing/docker/desktop-build/VERSION
testing/docker/desktop-build/bin/checkout-sources.sh
testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
--- a/testing/docker/desktop-build/REGISTRY
+++ b/testing/docker/desktop-build/REGISTRY
@@ -1,1 +1,1 @@
-taskcluster
+jlund
--- a/testing/docker/desktop-build/VERSION
+++ b/testing/docker/desktop-build/VERSION
@@ -1,1 +1,1 @@
-0.1.3
+0.1.7
--- a/testing/docker/desktop-build/bin/checkout-sources.sh
+++ b/testing/docker/desktop-build/bin/checkout-sources.sh
@@ -35,9 +35,21 @@ then
     tc-vcs checkout $WORKSPACE/build/tools $TOOLS_BASE_REPOSITORY $TOOLS_HEAD_REPOSITORY $TOOLS_HEAD_REV $TOOLS_HEAD_REF
 
     if [ ! -d build ]; then
         mkdir -p build
         ln -s $WORKSPACE/build/tools build/tools
     fi
 fi
 
+# TODO - include tools repository in EXTRA_CHECKOUT_REPOSITORIES list
+for extra_repo in $EXTRA_CHECKOUT_REPOSITORIES; do
+    BASE_REPO="${extra_repo}_BASE_REPOSITORY"
+    HEAD_REPO="${extra_repo}_HEAD_REPOSITORY"
+    HEAD_REV="${extra_repo}_HEAD_REV"
+    HEAD_REF="${extra_repo}_HEAD_REF"
+    DEST_DIR="${extra_repo}_DEST_DIR"
+
+    tc-vcs checkout ${!DEST_DIR} ${!BASE_REPO} ${!HEAD_REPO} ${!HEAD_REV} ${!HEAD_REF}
+done
+
+
 tc-vcs checkout $WORKSPACE/build/src $GECKO_BASE_REPOSITORY $GECKO_HEAD_REPOSITORY $GECKO_HEAD_REV $GECKO_HEAD_REF
--- a/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
@@ -36,17 +36,26 @@ task:
       MOZHARNESS_CONFIG: >
           builds/releng_base_android_64_builds.py
           disable_signing.py
           platform_supports_post_upload_to_latest.py
       MH_CUSTOM_BUILD_VARIANT_CFG: api-11-partner-sample1
       MH_BRANCH: {{project}}
       MH_BUILD_POOL: taskcluster
 
-      PARTNER_PROPS_PATH: 'mobile/android/config/mozconfigs/public-partner/distribution_sample/repo_props.json'
+      # space separated list of repositories required for this build
+      # for each ITEM in list you want checked out, you must also supply tc-vcs args:
+      # e.g. ${ITEM}_BASE_REPOSITORY
+      EXTRA_CHECKOUT_REPOSITORIES: >
+          PARTNER
+
+      PARTNER_BASE_REPOSITORY: 'https://github.com/lundjordan/fennec-distribution-sample'
+      PARTNER_HEAD_REPOSITORY: 'https://github.com/lundjordan/fennec-distribution-sample'
+      PARTNER_HEAD_REV: 4a322374d947b450d2807ebfc28f32728d7b4227
+      PARTNER_DEST_DIR: '/home/worker/workspace/build/partner'
 
       # image paths
       TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
       # authentication
       RELENGAPI_TOKEN: 'TODO' # 1164612: encrypt this secret
 
     maxRunTime: 36000