From: David Galloway <dgallowa@redhat.com>
Date: Tue, 20 Nov 2018 19:45:23 +0000 (-0500)
Subject: sepia-fog-images: Allow use of different teuth/cm branches
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=07a66328171095795c5a18544a0a05be6fa22225;p=ceph-build.git

sepia-fog-images: Allow use of different teuth/cm branches

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build
index 26d83104..e6e9033d 100755
--- a/sepia-fog-images/build/build
+++ b/sepia-fog-images/build/build
@@ -51,9 +51,12 @@ funRetry () {
 if [ ! -d teuthology ]; then
   git clone https://github.com/ceph/teuthology
   cd teuthology
+  git checkout $TEUTHOLOGYBRANCH
 else
   cd teuthology
+  git checkout master
   git pull
+  git checkout $TEUTHOLOGYBRANCH
 fi
 
 # Bootstrap teuthology
@@ -66,9 +69,13 @@ source $WORKSPACE/teuthology/virtualenv/bin/activate
 # Clone or update ceph-cm-ansible
 if [ ! -d ceph-cm-ansible ]; then
   git clone https://github.com/ceph/ceph-cm-ansible
+  cd ceph-cm-ansible
+  git checkout $CMANSIBLEBRANCH
 else
   cd ceph-cm-ansible
+  git checkout master
   git pull
+  git checkout $CMANSIBLEBRANCH
 fi
 
 cd $WORKSPACE
diff --git a/sepia-fog-images/config/definitions/sepia-fog-images.yml b/sepia-fog-images/config/definitions/sepia-fog-images.yml
index e860c1b0..b52ec7cb 100644
--- a/sepia-fog-images/config/definitions/sepia-fog-images.yml
+++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml
@@ -24,6 +24,14 @@
           name: MACHINETYPES
           default: "smithi mira"
           description: "Machine types to capture images for.  (e.g., 'smithi' or 'smithi mira' for multiple machine types)"
+      - string:
+          name: TEUTHOLOGYBRANCH
+          default: "master"
+          description: "Optionally define a different teuthology branch (useful for testing)"
+      - string:
+          name: CMANSIBLEBRANCH
+          default: "master"
+          description: "Optionally define a different ceph-cm-ansible branch (useful for testing)"
 
     builders:
       - shell: