Bug 1221645 - Make Nexus 4 KK and Nexus 5 L full images public. r=wcosta
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Wed, 04 Nov 2015 11:51:00 +0100
changeset 306842 4b9fc19085ce64853fc9766fe23427ed338067a3
parent 306841 80c7b6a57ed5ec1405b17e2b8cc361adab386c82
child 306843 990c71e8de3b2879b68a45a42edfdcc941fbb15e
push id7204
push usercku@mozilla.com
push dateThu, 05 Nov 2015 15:38:26 +0000
reviewerswcosta
bugs1221645
milestone45.0a1
Bug 1221645 - Make Nexus 4 KK and Nexus 5 L full images public. r=wcosta
b2g/config/nexus-4-kk/config.json
b2g/config/nexus-5-l/config.json
testing/taskcluster/scripts/phone-builder/post-build.sh
--- a/b2g/config/nexus-4-kk/config.json
+++ b/b2g/config/nexus-4-kk/config.json
@@ -12,17 +12,18 @@
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
-        "{objdir}/dist/b2g-update/*.mar"
+        "{objdir}/dist/b2g-update/*.mar",
+        "{workdir}/mako.zip"
     ],
     "zip_files": [
         ["{workdir}/out/target/product/mako/*.img", "out/target/product/mako/"],
         ["{workdir}/boot.img", "out/target/product/mako/"],
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml",
--- a/b2g/config/nexus-5-l/config.json
+++ b/b2g/config/nexus-5-l/config.json
@@ -12,17 +12,18 @@
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{objdir}/dist/b2g-*.tar.gz",
         "{workdir}/sources.xml",
-        "{objdir}/dist/b2g-update/*.mar"
+        "{objdir}/dist/b2g-update/*.mar",
+        "{workdir}/hammerhead.zip"
     ],
     "zip_files": [
         ["{workdir}/out/target/product/hammerhead/*.img", "out/target/product/hammerhead/"],
         ["{workdir}/boot.img", "out/target/product/hammerhead/"],
         "{workdir}/flash.sh",
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml",
--- a/testing/taskcluster/scripts/phone-builder/post-build.sh
+++ b/testing/taskcluster/scripts/phone-builder/post-build.sh
@@ -12,16 +12,21 @@ mkdir -p $HOME/artifacts-public
 
 DEVICE=${TARGET%%-*}
 
 mv $WORKSPACE/B2G/upload/sources.xml $HOME/artifacts/sources.xml
 mv $WORKSPACE/B2G/upload/b2g-*.android-arm.tar.gz $HOME/artifacts/b2g-android-arm.tar.gz
 mv $WORKSPACE/B2G/upload/${TARGET}.zip $HOME/artifacts/${TARGET}.zip
 mv $WORKSPACE/B2G/upload/gaia.zip $HOME/artifacts/gaia.zip
 
+# Upload public images as public artifacts on Nexus 4 KK and Nexus 5 L
+if [ "${TARGET}" = "nexus-4-kk" -o "${TARGET}" = "nexus-5-l" ]; then
+  mv $HOME/artifacts/${TARGET}.zip $HOME/artifacts-public/
+fi
+
 if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
   mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 fi
 
 if [ -f $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip ]; then
   mv $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip $HOME/artifacts-public/
 fi