gen_topo scripts: on error, print the last stderr message first

Author: ehellbar

DATA/tools/epn/gen_topo.sh

@@ -60,7 +60,3 @@ else
 fi
 # Run stage 2 of GenTopo, which does the PDP part, still from hardcoded updatable RPM path
 /opt/alisw/el9/GenTopo/bin/gen_topo_o2dpg.sh
-if [ $? != 0 ]; then
-  echo topology generation failed 1>&2
-  exit 1
-fi

DATA/tools/epn/gen_topo_logged.sh

@@ -26,6 +26,8 @@ if [[ ! -z $GEN_TOPO_LOGDATE ]]; then
     while read STDERRLINE; do
       echo "$GEN_TOPO_LOGDATE $ECS_ENVIRONMENT_ID :     $STDERRLINE" >> /var/log/topology/gen-topo.log
     done < $STDERRFILE
+    echo "FATAL $(tail -n 1 $STDERRFILE)" 1>&2
+    echo -e "\n - full stderr output:" 1>&2
   fi
 fi
 

DATA/tools/epn/gen_topo_o2dpg.sh

@@ -134,7 +134,7 @@ if [[ ! -z "$GEN_TOPO_ODC_EPN_TOPO_POST_CACHING_CMD" ]] && [[ "0$WORKFLOWMODE" !
   fi
   TMP_POST_CACHING_CMD+=" -o $GEN_TOPO_WORKDIR/output.xml.new $GEN_TOPO_WORKDIR/output.xml"
   echo "Running post-caching topo-merger command: $TMP_POST_CACHING_CMD" 1>&2
-  eval $TMP_POST_CACHING_CMD 1>&2 || { echo Error during EPN topology-merger resource allocation 1>&2; exit 1; }
+  eval $TMP_POST_CACHING_CMD 1>&2 || { echo Error during EPN resource allocation 1>&2; exit 1; }
   mv -f $GEN_TOPO_WORKDIR/output.xml.new $GEN_TOPO_WORKDIR/output.xml 1>&2
 fi