From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 10 Jul 2019 09:35:18 +0000 (+0200)
Subject: ceph-ansible: make it possible to run nighly job on custom branch
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1830e549428143c183b3643ea8dab20cff321aed;p=ceph-build.git

ceph-ansible: make it possible to run nighly job on custom branch

When running manually a nightly containerized job against a custom branch of
ceph-ansible, it fails because `CEPH_DOCKER_IMAGE_TAG` is not set.

Typical error:
```
+ case "$CEPH_ANSIBLE_BRANCH" in
+ CEPH_DOCKER_IMAGE_TAG=
+ '[' -n '' ']'
Build step 'Execute shell' marked build as failure
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/ceph-ansible-nightly/build/build b/ceph-ansible-nightly/build/build
index 0c869f45..ca23621a 100644
--- a/ceph-ansible-nightly/build/build
+++ b/ceph-ansible-nightly/build/build
@@ -36,10 +36,7 @@ function run_tox {
       CEPH_DOCKER_IMAGE_TAG=$(find_latest_tag "$RELEASE")
       ;;
     master)
-      CEPH_DOCKER_IMAGE_TAG="latest"
-      ;;
-    *)
-      CEPH_DOCKER_IMAGE_TAG=""
+      CEPH_DOCKER_IMAGE_TAG="latest-master"
       ;;
   esac
 
diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 504187a8..88cfe058 100644
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -211,6 +211,10 @@
           name: CEPH_ANSIBLE_BRANCH
           description: "The ceph-ansible branch (or tag) to test"
           default: "{ceph_ansible_branch}"
+      - string:
+          name: CEPH_DOCKER_IMAGE_TAG
+          description: "The ceph-container image tag to use"
+          default: ""
 
     triggers:
       - timed: '@daily'