Cleanup for support run

faucetsdn · Nov 4, 2023 · bd7504f · bd7504f
1 parent de63b6f
commit bd7504f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -150,6 +150,7 @@ jobs:
         run: |
           steps to show sequencer results.
           RESULT_LOG=$SITE_MODEL/out/devices/${DEVICE_NAME}/RESULT.log
+          sort -k 4 $RESULT_LOG | sponge $RESULT_LOG
           more $SITE_MODEL/out/sequencer_${DEVICE_NAME}.json $RESULT_LOG | cat
           if [[ -d expected ]]; then
             echo
@@ -162,16 +163,14 @@ jobs:
         run: fgrep ' ending test ' sequencer.log
       - name: Pubber output log
         if: vars.PUBBER_OPTS != ''
-        run: |
-          more $HOME/pubber.out | cat
+        run: more $HOME/pubber.out | cat
       - name: Create support bundle
         if: ${{ always() }}
-        run: |
-          $UDMI_BIN/support
+        run: $UDMI_BIN/support
       - name: Upload support bundle
         uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           if-no-files-found: error
           name: udmi-support_${{ github.run_id }}-${{ github.run_attempt }}
-          path: '/tmp/udmi-support_*.tgz'
+          path: 'udmi-support_*.tgz'
diff --git a/expected/sequencer-results_AHU-1.log b/expected/sequencer-results_AHU-1.log
@@ -1,17 +1,17 @@
 RESULT pass system config_logging BETA 5 Sequence complete
 RESULT pass system device_config_acked BETA 5 Sequence complete
-RESULT pass system extra_config BETA 5 Sequence complete
-RESULT pass system system_last_update STABLE 5 Sequence complete
-SCHEMA pass system system_last_update STABLE event_pointset No schema violations found
-SCHEMA pass system system_last_update STABLE event_system No schema violations found
-SCHEMA pass system system_last_update STABLE state_update No schema violations found
 RESULT pass enumeration empty_enumeration PREVIEW 5 Sequence complete
+RESULT pass schemas event_pointset_stable STABLE 5 All schema validations passed
+RESULT pass schemas event_system_stable STABLE 5 All schema validations passed
+RESULT pass system extra_config BETA 5 Sequence complete
 RESULT pass enumeration.features feature_enumeration PREVIEW 5 Sequence complete
 RESULT pass pointset pointset_publish BETA 5 Sequence complete
 RESULT pass pointset pointset_publish_interval BETA 5 Sequence complete
 RESULT pass pointset pointset_sample_rate BETA 5 Sequence complete
 RESULT pass system state_make_model BETA 5 Sequence complete
 RESULT pass system state_software BETA 5 Sequence complete
-RESULT pass schemas event_pointset_stable STABLE 5 All schema validations passed
-RESULT pass schemas event_system_stable STABLE 5 All schema validations passed
 RESULT pass schemas state_update_stable STABLE 5 All schema validations passed
+RESULT pass system system_last_update STABLE 5 Sequence complete
+SCHEMA pass system system_last_update STABLE event_pointset No schema violations found
+SCHEMA pass system system_last_update STABLE event_system No schema violations found
+SCHEMA pass system system_last_update STABLE state_update No schema violations found