Merge pull request #169 from puppetlabs/simplify-actions

Simplify Github Actions

Author: reidmv

.github/workflows/manual-smoke-test.yaml

@@ -1,18 +1,19 @@
 ---
-name: "Pull Request test"
+name: "Install test matrix"
 
 on:
   pull_request:
     branches: [main]
     types: [review_requested]
+  workflow_dispatch: {}
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
 jobs:
-  smoke-test:
-    name: "Install test: ${{ matrix.architecture }}, ${{ matrix.image }}, PE ${{ matrix.version }}"
+  test-install:
+    name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}"
     runs-on: ubuntu-20.04
     env:
       BOLT_GEM: true

.github/workflows/pr-test.yaml renamed to .github/workflows/test-install-matrix.yaml

@@ -1,5 +1,5 @@
 ---
-name: "Manual smoke test with debugging"
+name: "Install test"
 
 on:
   workflow_dispatch:
@@ -16,14 +16,18 @@ on:
         description: 'PE version to install'
         required: true
         default: '2019.8.5'
+      ssh-debugging:
+        description: 'Boolean; whether or not to pause for ssh debugging'
+        required: true
+        default: 'false'
 
 env:
   HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
   HONEYCOMB_DATASET: litmus tests
 
 jobs:
-  smoke-test:
-    name: "${{ matrix.architecture }}, ${{ matrix.image }}, PE ${{ matrix.version }}"
+  test-install:
+    name: "PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}"
     runs-on: ubuntu-20.04
     env:
       BOLT_GEM: true
@@ -41,6 +45,7 @@ jobs:
 
     steps:
       - name: 'Start SSH session'
+        if: ${{ github.event.inputs.ssh-debugging == 'true' }}
         uses: luchihoratiu/debug-via-ssh@main
         with:
           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
@@ -140,7 +145,7 @@ jobs:
           echo ::endgroup::
 
       - name: 'Wait as long as the file ${HOME}/pause file is present'
-        if: ${{ always() }}
+        if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
         run: |
           while [ -f "${HOME}/pause" ] ; do
             echo "${HOME}/pause present, sleeping for 60 seconds..."