Merge pull request #1344 from cfengine/ENT-10989/master

ENT-10989: Gather install logs in deployment-test if package fails to install

.github/workflows/deployment-tests.yml

@@ -133,7 +133,7 @@ jobs:
           key: packages-${{ env.PACKAGE_SHA }}
 
       - name: Save artifacts
-        if: ${{ success() || failure() && steps.build_package.conclusion != 'success' }}
+        if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: artifacts

ci/deployment-tests.sh

@@ -11,22 +11,28 @@ COMPUTED_ROOT="$(readlink -e "$(dirname "$0")/../../")"
 NTECH_ROOT=${NTECH_ROOT:-$COMPUTED_ROOT}
 USER=${USER:-$(whoami)}
 
-if [ ! -d /var/cfengine ]; then
-  # ci and local buildscripts should place built packages in $NTECH_ROOT/packages
-  sudo dpkg -i "$NTECH_ROOT"/packages/cfengine-nova-hub*deb
-fi
+# prepare artifacts dir
+sudo mkdir -p "${NTECH_ROOT}/artifacts"
+sudo chown "$USER" "${NTECH_ROOT}/artifacts"
 
-# now that cfengine is probably installed, run cf-support if there is an error
 trap failure ERR
-
 function failure() {
-  sudo mkdir -p "${NTECH_ROOT}/artifacts"
-  sudo chown "$USER" "${NTECH_ROOT}/artifacts"
   cd "${NTECH_ROOT}/artifacts"
-  sudo cf-support --yes > $$.cfsupportlog 2>&1 || cat $$.cfsupportlog
+  if command cf-support; then
+    sudo cf-support --yes > $$.cfsupportlog 2>&1 || cat $$.cfsupportlog
+  else
+    cp /var/log/CFEngine-Install* . # ${NTECH_ROOT}/artifacts cd previously
+  fi
   rm $$.cfsupportlog
 }
 
+if [ ! -d /var/cfengine ]; then
+  # ci and local buildscripts should place built packages in $NTECH_ROOT/packages
+  sudo dpkg -i "$NTECH_ROOT"/packages/cfengine-nova-hub*deb
+fi
+
+
+
 AGENT_LOG="${NTECH_ROOT}/artifacts/agent.log"
 if [ -f "$AGENT_LOG" ]; then
   mv "$AGENT_LOG" "${AGENT_LOG}.$(date +%s)"