combine provision with agent installation to retry both

Author: LukasAud

.github/workflows/module_acceptance.yml

@@ -132,25 +132,23 @@ jobs:
           bundle env
           echo ::endgroup::
 
-      - name: "Provision environment"
-        run: |
-          if [[ "${{ inputs.kernel_modules }}" == "true" ]] && [[ "${{matrix.platforms.provider}}" =~ docker* ]] ; then
-            DOCKER_RUN_OPTS="docker_run_opts: {'--volume': '/lib/modules/$(uname -r):/lib/modules/$(uname -r)'}"
-          else
-            DOCKER_RUN_OPTS=''
-          fi
-          bundle exec rake "litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }},$DOCKER_RUN_OPTS]"
-          # Redact password
-          FILE='spec/fixtures/litmus_inventory.yaml'
-          sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
-
-      - name: "Install Puppet agent"
+      - name: "Provision and install Puppet agent"
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 10
           retry_wait_seconds: 30
           command: |
+            if [[ "${{ inputs.kernel_modules }}" == "true" ]] && [[ "${{matrix.platforms.provider}}" =~ docker* ]] ; then
+            DOCKER_RUN_OPTS="docker_run_opts: {'--volume': '/lib/modules/$(uname -r):/lib/modules/$(uname -r)'}"
+            else
+              DOCKER_RUN_OPTS=''
+            fi
+            bundle exec rake "litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }},$DOCKER_RUN_OPTS]"
+            # Redact password
+            FILE='spec/fixtures/litmus_inventory.yaml'
+            sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
+
             if [[ "${{ matrix.collection.version }}" ]] ; then
               export PUPPET_VERSION=${{ matrix.collection.version }}
               bundle exec rake 'litmus:install_agent[${{ matrix.collection.collection }}]'