Merge pull request fabric8-analytics#20 from pkajaba/push-pr-images

Start pushing images for PR's

cico_run_tests.sh

@@ -8,3 +8,4 @@ build_image
 
 #IMAGE_NAME=$(make get-image-name) ./tests/run_integration_tests.sh
 
+push_image

cico_setup.sh

@@ -30,11 +30,11 @@ tag_push() {
 push_image() {
     local image_name
     local image_repository
-    local tag
+    local short_commit
     local push_registry
     image_name=$(make get-image-name)
     image_repository=$(make get-image-repository)
-    tag=$(git rev-parse --short=7 HEAD)
+    short_commit=$(git rev-parse --short=7 HEAD)
     push_registry="push.registry.devshift.net"
 
     # login first
@@ -45,8 +45,17 @@ push_image() {
         exit 1
     fi
 
-    tag_push ${push_registry}/${image_repository}:latest ${image_name}
-    tag_push ${push_registry}/${image_repository}:${tag} ${image_name}
+    if [ -n "${ghprbPullId}" ]; then
+        # PR build
+        pr_id="SNAPSHOT-PR-${ghprbPullId}"
+        tag_push ${push_registry}/${image_repository}:${pr_id} ${image_name}
+        tag_push ${push_registry}/${image_repository}:${pr_id}-${short_commit} ${image_name}
+    else
+        # master branch build
+        tag_push ${push_registry}/${image_repository}:latest ${image_name}
+        tag_push ${push_registry}/${image_repository}:${short_commit} ${image_name}
+    fi
+
     echo 'CICO: Image pushed, ready to update deployed app'
 }