From 4c38ab0fedb11d786b64d17e21ac40354281b7fc Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Tue, 29 Aug 2017 07:27:26 -0400
Subject: [PATCH] Update Image cache locations

This seems to have finally settled down, first off the Ocata exception
can finally be removed and the promotion images are in the rdo_trunk
folder universally now instead of delorean.


Change-Id: I45e7cbc0bafff5b637a75702aacb3ba874905b42
---
 ci-scripts/tripleo/microbrow.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/ci-scripts/tripleo/microbrow.sh b/ci-scripts/tripleo/microbrow.sh
index 51ab66af9..8246010aa 100755
--- a/ci-scripts/tripleo/microbrow.sh
+++ b/ci-scripts/tripleo/microbrow.sh
@@ -31,17 +31,12 @@ if [ ! -z ${current_build+x} ]
   source $WORKSPACE/tripleo-environments/ci-scripts/internal-functions.sh
   hash=$(get_delorean_hash_from_url $current_build)
 
-  #Ocata pipeling moving to new folder structure
-  if [[ $RELEASE == *ocata* ]]
-   then
-    cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/rdo_trunk/$hash/undercloud.qcow2"
-    export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash"
-  elif [[ $RELEASE == *rhos-* ]]
+  if [[ $RELEASE == *rhos-* ]]
    then
     cached_image="$INTERNAL_IMAGE_SERVER/$RELEASE/$current_build/undercloud.qcow2"
     export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars rhos_puddle=$current_build"
   else
-    cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/delorean/$hash/undercloud.qcow2"
+    cached_image="$INTERNAL_IMAGE_SERVER/centos-org-image-cache/$RELEASE/rdo_trunk/$hash/undercloud.qcow2"
     export VARS="$VARS --extra-vars undercloud_image_url=$cached_image --extra-vars dlrn_hash=$hash"
   fi