Adding second wait to add compiler test to debug fail

puppetlabs · Apr 25, 2024 · 42bddc9 · 42bddc9
1 parent fa0dc4c
commit 42bddc9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml
@@ -99,13 +99,24 @@ jobs:
             architecture=${{ matrix.architecture }} \
             version=${{ matrix.version }}
 
+      - name: 'Wait as long as the file ${HOME}/pause file is present'
+        if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}
+        run: |
+          while [ -f "${HOME}/pause" ] ; do
+            echo "${HOME}/pause present, sleeping for 60 seconds..."
+            sleep 60
+          done 
+          echo "${HOME}/pause absent, continuing workflow."
+
       - name: 'Run add_compiler plan'
-        timeout-minutes: 30
+        timeout-minutes: 50
         run: |
           bundle exec bolt plan run peadm_spec::add_compiler -v \
             --inventoryfile spec/fixtures/litmus_inventory.yaml \
             --modulepath spec/fixtures/modules \
-            architecture=${{ matrix.architecture }}
+            architecture=${{ matrix.architecture }} \
+            --stream \
+            --log-level debug
 
       - name: 'Wait as long as the file ${HOME}/pause file is present'
         if: ${{ always() && github.event.inputs.ssh-debugging == 'true' }}

diff --git a/spec/acceptance/peadm_spec/plans/add_compiler.pp b/spec/acceptance/peadm_spec/plans/add_compiler.pp
@@ -10,12 +10,20 @@
     $target.set_var('certname', $fqdn.first['stdout'].chomp)
   }
 
+  $primary_host = $t.filter |$n| { $n.vars['role'] == 'primary' }
+  run_task('peadm::puppet_runonce', $primary_host)
+
   $common_params = {
     avail_group_letter => 'A',
   }
 
   $arch_params =
     case $architecture {
+      'standard': {{
+        primary_host            => $t.filter |$n| { $n.vars['role'] == 'primary' },
+        primary_postgresql_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
+        compiler_host           => $t.filter |$n| { $n.vars['role'] == 'unconfigured-compiler' },
+      }}
       'large': {{
         primary_host            => $t.filter |$n| { $n.vars['role'] == 'primary' },
         primary_postgresql_host => $t.filter |$n| { $n.vars['role'] == 'primary' },

diff --git a/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp b/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp
@@ -23,6 +23,9 @@
       'extra-large-with-dr': {
         ['primary', 'primary-pdb-postgresql', 'compiler', 'replica', 'replica-pdb-postgresql', 'compiler']
       }
+      'standard-with-extra-compiler': {
+        ['primary', 'unconfigured-compiler']
+      }
       'large-with-extra-compiler': {
         ['primary', 'compiler', 'unconfigured-compiler']
       }