From 26e6908d1378ae17d58152c55cd92a82035648ab Mon Sep 17 00:00:00 2001
From: Erwan Velu <erwan@redhat.com>
Date: Fri, 16 Mar 2018 13:02:52 +0100
Subject: [PATCH] ceph-ansible-nightly/build: Simplify run_tox() logic

The actual logic was a little bit complicated to read.
Since find_latest_tag() is generic, let's reuse it inside a case() loop.
---
 ceph-ansible-nightly/build/build | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build
index 8259930a..964e3e9c 100644
--- a/ceph-ansible-nightly/build/build
+++ b/ceph-ansible-nightly/build/build
@@ -31,17 +31,21 @@ function find_latest_tag {
 }
 
 function run_tox {
-  if [ "$RELEASE" == 'jewel' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-2.2' -o "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then
-    start_tox CEPH_DOCKER_IMAGE_TAG="$LAST_JEWEL_STABLE_TAG"
-  elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'stable-3.0' ]; then
-    # start_tox(): <CEPH_DOCKER_IMAGE_TAG> <CEPH_STABLE_RELEASE>
-    start_tox CEPH_DOCKER_IMAGE_TAG="$LAST_LUMINOUS_STABLE_TAG"
-  elif [ "$RELEASE" == 'luminous' ] && [ "$CEPH_ANSIBLE_BRANCH" == 'master' ]; then
-    start_tox CEPH_DOCKER_IMAGE_TAG=latest
-  fi
+  case "$CEPH_ANSIBLE_BRANCH" in
+    stable-*)
+      CEPH_DOCKER_IMAGE_TAG=$(find_latest_tag "$RELEASE")
+      ;;
+    master)
+      CEPH_DOCKER_IMAGE_TAG="latest"
+      ;;
+    *)
+      CEPH_DOCKER_IMAGE_TAG=""
+      ;;
+  esac
+
+  [ -n "$CEPH_DOCKER_IMAGE_TAG" ] && start_tox CEPH_DOCKER_IMAGE_TAG="$CEPH_DOCKER_IMAGE_TAG"
 }
 
-
 ########
 # MAIN #
 ########
@@ -50,6 +54,4 @@ clear_libvirt_networks
 restart_libvirt_services
 update_vagrant_boxes
 count_tag_pages
-LAST_JEWEL_STABLE_TAG=$(find_latest_tag jewel)
-LAST_LUMINOUS_STABLE_TAG=$(find_latest_tag luminous)
 run_tox
-- 
2.39.5