Fixed #569: Make sure that official builds are only available for team & customers

Author: Antonis

Examples/restcomm-olympus/app/build.gradle

@@ -28,7 +28,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "org.restcomm.android.olympus"
+        applicationId APPLICATION_ID
         // Using 18 instead of initial 16 due to introduction of UIAutomator for tests (and more specifically being able to handle system permission dialogs)
         // TODO: lets see if we can workaround this so that App can still use 16 which is good for backward compatibility, yet use 18 for tests
         // (most probably by using gradle product flavors). Notice though that this doesn't affect SDK so not critical

Examples/restcomm-olympus/gradle.properties

@@ -22,6 +22,9 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 #LIBRARY_ARTIFACT_ID=restcomm-android-sdk
 #LIBRARY_VERSION=1.0.0-beta6-SNAPSHOT
 
+# defaultConfig applicationId
+APPLICATION_ID=org.restcomm.android.olympus
+
 # Let's use my personal free xirsys account credentials for community, so that STUN/TURN works out of the box and eases adoption
 ICE_USERNAME = "atsakiridis"
 ICE_PASSWORD = "4e89a09e-bf6f-11e5-a15c-69ffdcc2b8a7"

scripts/start-ci-cd.bash

@@ -31,6 +31,7 @@
 # - ORG_GRADLE_PROJECT_TESTFAIRY_APIKEY: Secret key for using TestFairy API (only needed if uploading to TF)
 # - ORG_GRADLE_PROJECT_TESTFAIRY_AUTOUPDATE: Should we request from TestFairy to enable auto update for newly uploaded Olympus, true/false (only needed if uploading to TF)
 # - TESTFAIRY_APP_TOKEN: Test Fairy App token, so that only CI builds send stats to TF
+# - SKIP_OLYMPUS_UI_TESTS: skip espresso UI tests using Olympus, true/false
 # - SKIP_INTEGRATION_TESTS: skip Integration Tests, true/false (not implemented yet)
 # - SKIP_DOC_GENERATION: skip Reference Documentation generation, true/false
 # - SKIP_SDK_PUBLISH_TO_MAVEN_REPO: Should SDK library artifact be signed and uploaded to Maven Central, true/false

scripts/upload-olympus-to-testfairy.bash

@@ -31,10 +31,29 @@ then
 fi
 
 # Skip the signArchives task until we properly setup Travis for signing + upload of archives to Sonatype. Otherwise the build breaks
-cd Examples/restcomm-olympus && ./gradlew --quiet -x signArchives -x uploadArchives -x androidJavadocs -PtestfairyChangelog="Version: $ORG_GRADLE_PROJECT_VERSION_NAME+$ORG_GRADLE_PROJECT_VERSION_CODE, GitHub commit: $COMMIT_SHA1" testfairyDebug || exit 1
+cd Examples/restcomm-olympus || exit 1
+
+if [ -z "$ICE_USERNAME" ] || [ -z "$PICE_PASSWORD" ] || [ -z "$PICE_DOMAIN" ]
+then
+	echo "-- Error: ICE_USERNAME, ICE_PASSWORD and ICE_DOMAIN need to be set for premium Olympus to be built"
+	exit 1
+fi
+
+# Upload premium version to TF
+echo "-- Uploading premium version to Test Fairy"
+./gradlew --quiet -x signArchives -x uploadArchives -x androidJavadocs -PICE_USERNAME=$ICE_USERNAME -PICE_PASSWORD=$ICE_PASSWORD -PICE_DOMAIN=$ICE_DOMAIN -PAPPLICATION_ID="org.restcomm.android.olympus.premium" -PtestfairyChangelog="Version: $ORG_GRADLE_PROJECT_VERSION_NAME+$ORG_GRADLE_PROJECT_VERSION_CODE, GitHub commit: $COMMIT_SHA1, premium build" testfairyDebug || exit 1
+if [ $? -ne 0 ]
+then
+	echo "-- Failed to build Olympus premium for uploading to TestFairy."
+	exit 1
+fi 
+
+# Upload community version to TF, so that it gets a separate download point from premium (no need to specify APPLICATION_ID as default is for community)
+echo "-- Uploading community version to Test Fairy"
+./gradlew --quiet -x signArchives -x uploadArchives -x androidJavadocs -PtestfairyChangelog="Version: $ORG_GRADLE_PROJECT_VERSION_NAME+$ORG_GRADLE_PROJECT_VERSION_CODE, GitHub commit: $COMMIT_SHA1, community build" testfairyDebug || exit 1
 if [ $? -ne 0 ]
 then
-	echo "-- Failed to build Olympus for uploading to TestFairy."
+	echo "-- Failed to build Olympus community for uploading to TestFairy."
 	exit 1
 fi