diff --git a/.github/workflows/module_acceptance.yml b/.github/workflows/module_acceptance.yml index 1bfa5be..faf454a 100644 --- a/.github/workflows/module_acceptance.yml +++ b/.github/workflows/module_acceptance.yml @@ -69,7 +69,7 @@ jobs: bundle exec matrix_from_metadata_v3 ${{ inputs.flags }} acceptance: - name: "Acceptance tests (${{matrix.platforms.label}}, ${{matrix.collection.collection || matrix.collection}})" + name: "${{matrix.platforms.label}}, ${{matrix.collection.collection || matrix.collection}}" needs: "setup_matrix" runs-on: ${{ inputs.runs_on || matrix.platforms.runner }} timeout-minutes: 180 @@ -89,24 +89,6 @@ jobs: with: service-key: ${{ env.TWINGATE_PUBLIC_REPO_KEY }} - - name: Fix DNS - run: | - echo "=== Remove Azure DNS from eth0 interface ===" - sudo resolvectl dns eth0 "" - - echo "=== Configure Twingate DNS properly ===" - sudo resolvectl dns sdwan0 100.95.0.251 100.95.0.252 - sudo resolvectl domain sdwan0 delivery.puppetlabs.net - - echo "=== Flush DNS cache ===" - sudo resolvectl flush-caches - - echo "=== Check new configuration ===" - resolvectl status - - echo "=== Test DNS resolution ===" - nslookup artifactory.delivery.puppetlabs.net - - name: "Checkout" uses: "actions/checkout@v4" @@ -144,14 +126,35 @@ jobs: FILE='spec/fixtures/litmus_inventory.yaml' sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true - - name: "Install Puppet agent" - run: | - if [[ "${{ matrix.collection.version }}" ]] ; then - export PUPPET_VERSION=${{ matrix.collection.version }} - bundle exec rake 'litmus:install_agent[${{ matrix.collection.collection }}]' - else - bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]' - fi + - name: "Fix DNS and Install Puppet agent" + uses: nick-fields/retry@v3 + with: + timeout_minutes: 10 + max_attempts: 10 + retry_wait_seconds: 30 + command: | + echo "=== Remove Azure DNS from eth0 interface ===" + sudo resolvectl dns eth0 "" + + echo "=== Configure Twingate DNS properly ===" + sudo resolvectl dns sdwan0 100.95.0.251 100.95.0.252 + sudo resolvectl domain sdwan0 delivery.puppetlabs.net + + echo "=== Flush DNS cache ===" + sudo resolvectl flush-caches + + echo "=== Check new configuration ===" + resolvectl status + + echo "=== Test DNS resolution ===" + nslookup artifactory.delivery.puppetlabs.net + + if [[ "${{ matrix.collection.version }}" ]] ; then + export PUPPET_VERSION=${{ matrix.collection.version }} + bundle exec rake 'litmus:install_agent[${{ matrix.collection.collection }}]' + else + bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]' + fi - name: "Install module" run: |