Move to mapbox bucket

5 files changed, 35 insertions, 14 deletions

diff --git a/.travis.yml b/.travis.yml
index e3c541c865..317045f7c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,9 +40,9 @@ matrix:
 
 env:
   global:
-   - secure: "MZHblLZXG/jWf2w0ZFlxCLDwx2qtGgRDODQyg1BR7JIuMz6AtWv8XR/sUczWLbiABCL0a/NzJF1g4v2pI7X69IntcjOdIABBgTh7++6+1TJ0Kp8viEltb55nQG3lHy/R6fOaI7Pj9tuCX0PCRtGA5C/fGnodLGEjy3RVOJ09ln0="
-   - secure: "KaSQbhgjtV7ZCkesHmvrNsbQVjk5SPfGKB1VkWenRGYhLF45HpSRNwSxMQddZ566Pg7qIFgF1iWl/B0QW3B6AWL5WmzQ5AOJgwS876pNIc/UT7ubMPtgAtjpvw1bQvQP3B8MrB+3OE5c6tD+a3LhR9krV//dOsfErR5Yy+3Mbkc="
-   - ANDROID_BUILD_INSTANCE_PROFILE: arn:aws:iam::234858372212:instance-profile/android-gl-build/travis/instance-profile/travis-mapbox-gl-native-AndroidInstanceProfile-13EA815DD8IQ9
+   - secure: "XuZ5KNGVLyMC6fhUchdvMPp6NqT+WtYfIsiT8zGuzaFTfwUiwijAsSye++wZLXbWqH5DU5xHjNdBpmwT2bXjzWkyR+OYjKD7a0K3hzuGhNuSb4wcVaXr0bhsAzarFqaTXjf/Mrinl1eSLJnHY6NW9OJkyqUvi0vPY/+55Ry2WwQ="
+   - secure: "Uvau7bpGpnbWnsFlgeCjPNBuw+HOQ5sZzdKGdm3wuKmPROfAoVuGb1N3mIYcL2iSiUTomn7CVoLDSXbiYSGlM6nzJ0N/dV+GMJV5f7gO/1b46hfiBNnR7eGr0oH4DzSYefS/8DcbLWFtCTePdNtvpCko/BHfcOx0WSXl2SNIFYk="
+   - ANDROID_BUILD_INSTANCE_PROFILE: arn:aws:iam::234858372212:instance-profile/android-gl-build/travis/instance-profile/travis-mapbox-gl-native-move-bucket-AndroidInstanceProfile-NF37L9BZ6FOO
    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
    - secure: "CHBiUM60TolDbQnn+4IRA/tvOKwKs3g9EDvv8YHSJMg3FuHmjKQkprBasvxf3hnTXg4WLZEubmeDcyJ6RRzPP5mMSr/hksYl0pSjj/6TUecE5fHPVVeN7txVqkpOBf9i45Y+iBUQMjBb1NnDK3pHXxpnAs1Q/pe7vReErj4GF1U="
    - LD_LIBRARY_PATH: '/usr/local/lib'
diff --git a/android/scripts/common.sh b/android/scripts/common.sh
index 349569b55f..48b441ba59 100755
--- a/android/scripts/common.sh
+++ b/android/scripts/common.sh
@@ -14,6 +14,6 @@ echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/MapboxGLAndroidSDKTestApp/src/ma
 
 make android -j$JOBS BUILDTYPE=$BUILDTYPE JOBS=$JOBS
 
-aws s3 cp ./build/android-${ANDROID_ABI}/${BUILDTYPE}/lib.target/libmapbox-gl.so s3://mapbox-gl-testing/android/${NAME}/libmapbox-gl.so
-aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-debug.apk
-aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
+aws s3 cp ./build/android-${ANDROID_ABI}/${BUILDTYPE}/lib.target/libmapbox-gl.so s3://mapbox/mapbox-gl-native/android/build/${NAME}/libmapbox-gl.so
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk s3://mapbox/mapbox-gl-native/android/build/${NAME}/MapboxGLAndroidSDKTestApp-debug.apk
+aws s3 cp ./android/java/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-release-unsigned.apk s3://mapbox/mapbox-gl-native/android/build/${NAME}/MapboxGLAndroidSDKTestApp-release-unsigned.apk
diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh
index a993cbdbd7..43d58622e9 100755
--- a/android/scripts/run-build.sh
+++ b/android/scripts/run-build.sh
@@ -43,7 +43,7 @@ user_data="#!/bin/bash
     fi
     popd
 
-    aws s3 cp --region us-east-1 build.log s3://mapbox-gl-testing/android/${NAME}/build-log.txt
+    aws s3 cp --region us-east-1 build.log s3://mapbox/mapbox-gl-native/android/build/${NAME}/build-log.txt
     shutdown -P now"
 
 id=$(aws ec2 run-instances \
@@ -73,7 +73,7 @@ echo "Build finished"
 
 output=$(aws ec2 get-console-output --region $region --instance-id $id | jq -r '.Output')
 
-aws s3 cp --region $region s3://mapbox-gl-testing/android/${NAME}/build-log.txt build.log
+aws s3 cp --region $region s3://mapbox/mapbox-gl-native/android/build/${NAME}/build-log.txt build.log
 cat build.log
 
 if [[ $output == *"ANDROID BUILD PASSED"* ]]; then
diff --git a/test/suite b/test/suite
-Subproject 7423bba25d7b62a31475a3ab2e99c68f3737444
+Subproject 6ac15153826ab26f778d61034119ffa8f97566a
diff --git a/travis/travis-resources.template b/travis/travis-resources.template
index 0d058dbf3e..9351501052 100644
--- a/travis/travis-resources.template
+++ b/travis/travis-resources.template
@@ -8,7 +8,7 @@
             "Properties": {
                 "Policies": [
                     {
-                        "PolicyName": "list",
+                        "PolicyName": "list-testing-old",
                         "PolicyDocument": {
                             "Statement": [
                                 {
@@ -24,7 +24,7 @@
                         }
                     },
                     {
-                        "PolicyName": "build",
+                        "PolicyName": "build-testing-old",
                         "PolicyDocument": {
                             "Statement": [
                                 {
@@ -53,8 +53,13 @@
                                     ],
                                     "Effect": "Allow",
                                     "Resource": [
-                                        "arn:aws:s3:::mapbox-gl-testing"
-                                    ]
+                                        "arn:aws:s3:::mapbox"
+                                    ],
+                                    "Condition": {
+                                        "StringLike": {
+                                            "s3:prefix": "mapbox-gl-native/*"
+                                        }
+                                    }
                                 }
                             ]
                         }
@@ -73,7 +78,7 @@
                                     ],
                                     "Effect": "Allow",
                                     "Resource": [
-                                        "arn:aws:s3:::mapbox-gl-testing/*"
+                                        "arn:aws:s3:::mapbox/mapbox-gl-native/*"
                                     ]
                                 }
                             ]
@@ -139,7 +144,7 @@
                 },
                 "Policies": [
                     {
-                        "PolicyName": "android",
+                        "PolicyName": "android-testing",
                         "PolicyDocument": {
                             "Statement": [
                                 {
@@ -153,6 +158,22 @@
                                 }
                             ]
                         }
+                    },
+                    {
+                        "PolicyName": "android",
+                        "PolicyDocument": {
+                            "Statement": [
+                                {
+                                    "Effect": "Allow",
+                                    "Action": [
+                                        "s3:PutObject"
+                                    ],
+                                    "Resource": [
+                                        "arn:aws:s3:::mapbox/mapbox-gl-native/android/build/*"
+                                    ]
+                                }
+                            ]
+                        }
                     }
                 ],
                 "Path": "/android-gl-build/travis/role/"