sepia-fog-images: Optionally allow specifying machines

This is useful if you already have machine(s) locked

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

diff --git a/sepia-fog-images/README.rst b/sepia-fog-images/README.rst
index e22a7f9ce411562b0a511b1cb70b3a824ac15627..1e512879a96db6a8839048f241587830df75fffc 100644 (file)
--- a/sepia-fog-images/README.rst
+++ b/sepia-fog-images/README.rst
@@ -30,7 +30,7 @@ How it works
 
 This job:
 
-#. Locks a number of testnodes via ``teuthology-lock`` depending on the number of machine types and distros you specify.
+#. Locks a number of testnodes via ``teuthology-lock`` depending on the number of machine types and distros you specify (unless you specify your own using the ``DEFINEDHOSTS`` job parameter).
 
 #. SSHes and configures the DHCP server to make the testnodes boot to the Cobbler PXE server (instead of the default FOG).
 

diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build
index 74e2669e3a9c4b2ca4e0a91c42445bffac845c6d..c2b3bc0075ef75fc6a3fc89dd328bf646185ddbd 100755 (executable)
--- a/sepia-fog-images/build/build
+++ b/sepia-fog-images/build/build
@@ -62,12 +62,25 @@ else
   git checkout $TEUTHOLOGYBRANCH
 fi
 
-# Bootstrap teuthology
-./bootstrap
+# Should we use teuthology-lock to lock systems?
+if [ "$DEFINEDHOSTS" == "" ]; then
+  use_teuthologylock=true
+else
+  use_teuthologylock=false
+fi
 
-cd $WORKSPACE
+if [ "$use_teuthologylock" = true ]; then
+  # Bootstrap teuthology
+  ./bootstrap
 
-source $WORKSPACE/teuthology/virtualenv/bin/activate
+  cd $WORKSPACE
+
+  source $WORKSPACE/teuthology/virtualenv/bin/activate
+else
+  virtualenv $WORKSPACE/venv
+  source $WORKSPACE/venv/bin/activate
+  pip install $(grep -E 'ansible==' requirements.txt | awk '{ print $1 }')
+fi
 
 # Clone or update ceph-cm-ansible
 if [ ! -d ceph-cm-ansible ]; then
@@ -83,33 +96,39 @@ fi
 
 cd $WORKSPACE
 
-# Don't bail if we fail to lock machines
-set +e
+if [ "$use_teuthologylock" = true ]; then
+  # Don't bail if we fail to lock machines
+  set +e
 
-numdistros=$(echo $DISTROS | wc -w)
-# Keep trying to lock machines
-for type in $MACHINETYPES; do
-  numlocked=$(teuthology-lock --brief --machine-type $type | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | wc -l)
-  currentretries=0
-  while [ $numlocked -lt $numdistros ]; do
-    # Lock one at a time since we have a better shot of getting one instead of all at once.
-    # Setting the BUILD_NUMBER in the description makes sure each Jenkins job uses the right machines.
-    # This is useful for when a job is aborted and another is started while the previous job's machines are debugged/cleaned up.
-    teuthology-lock --lock-many 1 --machine-type $type --desc "Locked to capture FOG image for Jenkins build $BUILD_NUMBER"
-    # Sleep for a bit so we don't hammer the lock server
-    if [ $? -ne 0 ]; then
-      sleep 5
-    fi
+  numdistros=$(echo $DISTROS | wc -w)
+  # Keep trying to lock machines
+  for type in $MACHINETYPES; do
     numlocked=$(teuthology-lock --brief --machine-type $type | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | wc -l)
-    ((++currentretries))
-    # Retry for 1hr
-    funRetry $currentretries 720
+    currentretries=0
+    while [ $numlocked -lt $numdistros ]; do
+      # Lock one at a time since we have a better shot of getting one instead of all at once.
+      # Setting the BUILD_NUMBER in the description makes sure each Jenkins job uses the right machines.
+      # This is useful for when a job is aborted and another is started while the previous job's machines are debugged/cleaned up.
+      teuthology-lock --lock-many 1 --machine-type $type --desc "Locked to capture FOG image for Jenkins build $BUILD_NUMBER"
+      # Sleep for a bit so we don't hammer the lock server
+      if [ $? -ne 0 ]; then
+        sleep 5
+      fi
+      numlocked=$(teuthology-lock --brief --machine-type $type | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | wc -l)
+      ((++currentretries))
+      # Retry for 1hr
+      funRetry $currentretries 720
+    done
   done
-done
 
-set -e
+  set -e
+
+  allhosts=$(teuthology-lock --brief | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | cut -d '.' -f1 | tr "\n" " ")
+else
+  allhosts="$DEFINEDHOSTS"
+  set -e
+fi
 
-allhosts=$(teuthology-lock --brief | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | cut -d '.' -f1 | tr "\n" " ")
 # Configure DHCP to use cobbler as the PXE server for each machine to reimage and ansiblize
 for machine in $allhosts; do
   ssh ubuntu@store01.front.sepia.ceph.com "sudo /usr/local/sbin/set-next-server.sh $machine cobbler"
@@ -123,7 +142,11 @@ fogcaptureid=$(curl -f -s -k -H "fog-api-token: ${FOG_API_TOKEN}" -H "fog-user-t
 
 # Set cobbler profile and FOG image ID for each locked machine
 for type in $MACHINETYPES; do
-  lockedhosts=$(teuthology-lock --brief --machine-type $type | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | cut -d '.' -f1 | sort)
+  if [ "$use_teuthologylock" = true ]; then
+    lockedhosts=$(teuthology-lock --brief --machine-type $type | grep "Locked to capture FOG image for Jenkins build $BUILD_NUMBER" | cut -d '.' -f1 | sort)
+  else
+    lockedhosts=$(echo $DEFINEDHOSTS | grep -o "\w*${type}\w*")
+  fi
   # Create arrays using our lists so we can iterate through them
   array1=($lockedhosts)
   array2=($DISTROS)
@@ -239,7 +262,12 @@ if [ "$pausedqueue" = true ]; then
   done
 fi
 
-# Unlock all machines after all capture images are finished
-for host in $allhosts; do
-  teuthology-lock --unlock $host
-done
+if [ "$use_teuthologylock" = true ]; then
+  # Unlock all machines after all capture images are finished
+  for host in $allhosts; do
+    teuthology-lock --unlock $host
+  done
+else
+  deactivate
+  rm -rf $WORKSPACE/venv
+fi

diff --git a/sepia-fog-images/config/definitions/sepia-fog-images.yml b/sepia-fog-images/config/definitions/sepia-fog-images.yml
index 92d9b0c2da28c84ca6543d3003990bf739bd9045..72689688ba622c886bc8e377f6f12f4005f9f5a2 100644 (file)
--- a/sepia-fog-images/config/definitions/sepia-fog-images.yml
+++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml
@@ -40,6 +40,10 @@
           name: PAUSEQUEUE
           default: "true"
           description: "Should the teuthology queue be paused?  Recapturing an existing OS image will cause running reimages to fail without pausing the queue.  The queue can remain unpaused when a new distro/version is being captured.  Queue is paused by default."
+      - string:
+          name: DEFINEDHOSTS
+          default: ""
+          description: "Define a list of systems to use instead of using teuthology-lock to lock unused systems."
 
     builders:
       - shell: