Added a repack_helper.sh script to gather useful function to do repack tests

Added a display of the state of the tape before and after each repack

continuousintegration/orchestration/tests/repack_helper.sh

+#!/bin/bash
+
+usage() { cat <<EOF 1>&2
+Usage: $0 -n <namespace>
+EOF
+exit 1
+}
+
+while getopts "n:" o; do
+    case "${o}" in
+        n)
+            NAMESPACE=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [ -z "${NAMESPACE}" ]; then
+    usage
+fi
+
+if [ ! -z "${error}" ]; then
+    echo -e "ERROR:\n${error}"
+    exit 1
+fi
+
+executeReclaim() {
+    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta reclaim -v $1
+    echo "Tape $1 reclaimed"
+}
+
+getVidToRepack() {
+  vidToRepack=$(kubectl -n ${NAMESPACE} exec ctacli -ti -- cta-admin --json ta ls --all | jq -r '[.[] | select(.occupancy != "0") | select(.lastFseq != 0) | .vid] | .[0]')
+  echo $vidToRepack
+}
+
+writeTapeSummary(){
+  echo "Summary of the content of the tape $1"
+  kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta ls -v $1 -h
+}
+
+executeRepack() {
+    WAIT_FOR_REPACK_FILE_TIMEOUT=300
+    echo
+    echo "Changing the tape $1 to FULL status"
+    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta ch -v $1 -f true
+    echo "Creating the eos directory to put the retrieve files from the repack request"
+    kubectl -n ${NAMESPACE} exec ctacli -- rm -rf root://ctaeos//eos/ctaeos/repack
+    kubectl -n ${NAMESPACE} exec ctaeos -- eos mkdir /eos/ctaeos/repack
+    kubectl -n ${NAMESPACE} exec ctaeos -- eos chmod 1777 /eos/ctaeos/repack
+    echo "Removing an eventual previous repack request for tape $1"
+    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re rm -v $1
+    echo "Launching the repack request on tape $1"
+    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re add -v $1 -m -b root://ctaeos//eos/ctaeos/repack
+    SECONDS_PASSED=0
+    while test 0 = `kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re ls -v $1 | grep -E "Complete|Failed" | wc -l`; do
+      echo "Waiting for repack request on tape $1 to be complete: Seconds passed = $SECONDS_PASSED"
+      sleep 1
+      let SECONDS_PASSED=SECONDS_PASSED+1
+
+      if test ${SECONDS_PASSED} == ${WAIT_FOR_REPACK_FILE_TIMEOUT}; then
+        echo "Timed out after ${WAIT_FOR_REPACK_FILE_TIMEOUT} seconds waiting for tape $1 to be repacked"
+        exit 1
+      fi
+    done
+    if test 1 = `kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re ls -v $1 | grep -E "Failed" | wc -l`; then
+        echo "Repack failed for tape $1"
+        exit 1
+    fi
+}
\ No newline at end of file

continuousintegration/orchestration/tests/simple_repack.sh

@@ -27,79 +27,44 @@ if [ ! -z "${error}" ]; then
     exit 1
 fi
 
-executeReclaim() {
-    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta reclaim -v $1
-    echo "Tape $1 reclaimed"
-}
-
-getVidToRepack() {
-  vidToRepack=$(kubectl -n ${NAMESPACE} exec ctacli -ti -- cta-admin --json ta ls --all | jq '[.[] | select(.occupancy != "0") | select(.lastFseq != 0) | .vid] | .[0]' | tr -d '"')
-  echo $vidToRepack
-}
-
-executeRepack() {
-    WAIT_FOR_REPACK_FILE_TIMEOUT=300
-    echo
-    echo "Changing the tape $1 to FULL status"
-    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta ch -v $1 -f true
-    echo "Creating the eos directory to put the retrieve files from the repack request"
-    kubectl -n ${NAMESPACE} exec ctacli -- rm -rf root://ctaeos//eos/ctaeos/repack
-    kubectl -n ${NAMESPACE} exec ctaeos -- eos mkdir /eos/ctaeos/repack
-    kubectl -n ${NAMESPACE} exec ctaeos -- eos chmod 1777 /eos/ctaeos/repack
-    echo "Removing an eventual previous repack request for tape $1"
-    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re rm -v $1
-    echo "Launching the repack request on tape $1"
-    kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re add -v $1 -m -b root://ctaeos//eos/ctaeos/repack
-    SECONDS_PASSED=0
-    while test 0 = `kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re ls -v $1 | grep -E "Complete|Failed" | wc -l`; do
-      echo "Waiting for repack request on tape $1 to be complete: Seconds passed = $SECONDS_PASSED"
-      sleep 1
-      let SECONDS_PASSED=SECONDS_PASSED+1
-
-      if test ${SECONDS_PASSED} == ${WAIT_FOR_REPACK_FILE_TIMEOUT}; then
-        echo "Timed out after ${WAIT_FOR_REPACK_FILE_TIMEOUT} seconds waiting for tape $1 to be repacked"
-        exit 1
-      fi
-    done
-    if test 1 = `kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re ls -v $1 | grep -E "Failed" | wc -l`; then
-        echo "Repack failed for tape $1"
-        exit 1
-    fi
-}
+source ./repack_helper.sh
 
 echo "Execution of simple_repack.sh"
 
 vidToRepack1=$(getVidToRepack)
 if [ "$vidToRepack1" != "null" ] 
 then
+  echo
+  writeTapeSummary $vidToRepack1
   executeRepack $vidToRepack1
+  echo
+  echo "Reclaiming tape $vidToRepack1"
+  executeReclaim $vidToRepack1
+  echo
+  writeTapeSummary $vidToRepack1
 else
   echo "No vid found to repack"
   exit 1
 fi
 
-sleep 1
-
-echo "Reclaiming tape $vidToRepack1"
-executeReclaim $vidToRepack1
-
 vidToRepack2=$(getVidToRepack)
 if [ "$vidToRepack2" != "null" ] 
 then
+  echo
+  writeTapeSummary $vidToRepack2
   executeRepack $vidToRepack2
+  echo
+  echo "Reclaiming tape $vidToRepack2"
+  executeReclaim $vidToRepack2
+  echo
+  writeTapeSummary $vidToRepack1
+  writeTapeSummary $vidToRepack2
 else
   echo "No vid found to repack"
   exit 1
 fi
 
 echo
-echo "Reclaiming tape $vidToRepack2"
-executeReclaim $vidToRepack2
-
-echo "Summary of the content of the tapes"
-kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta ls -v $vidToRepack1 -h
-kubectl -n ${NAMESPACE} exec ctacli -- cta-admin ta ls -v $vidToRepack2 -h
-
 echo
 echo "Summary of the repack requests"
 kubectl -n ${NAMESPACE} exec ctacli -- cta-admin re ls -h