Merge pull request puppetlabs#323 from DavidS/pdk-update

Apply DavidS:stop-retrying template changes
DavidS · Nov 25, 2020 · ef1d1bf · ef1d1bf
2 parents 4904b4a + 8fd0522
commit ef1d1bf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 46 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -156,26 +156,13 @@ jobs:
  sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
  echo ::endgroup::
 
- # The provision service hands out machines as soon as they're provisioned.
- # The GCP VMs might still take a while to spool up and configure themselves fully.
- # This retry loop spins until all agents have been installed successfully.
  - name: Install agent
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 30
- max_attempts: 5
- retry_wait_seconds: 60
- command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+ run: |
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
- # The agent installer on windows does not finish in time for this to work. To
- # work around this for now, retry after a minute if installing the module failed.
  - name: Install module
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 30
- max_attempts: 2
- retry_wait_seconds: 60
- command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+ run: |
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
  - name: "Honeycomb: Record deployment times"
  if: ${{ always() }}
@@ -200,11 +187,13 @@ jobs:
  - name: Remove test environment
  if: ${{ always() }}
  run: |
- buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
- echo ::group::=== REQUEST ===
- cat request.json || true
- echo
- echo ::endgroup::
+ if [ -f inventory.yaml ]; then
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+ echo ::group::=== REQUEST ===
+ cat request.json || true
+ echo
+ echo ::endgroup::
+ fi
 
  - name: "Honeycomb: Record removal times"
  if: ${{ always() }}

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -154,26 +154,13 @@ jobs:
  sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
  echo ::endgroup::
 
- # The provision service hands out machines as soon as they're provisioned.
- # The GCP VMs might still take a while to spool up and configure themselves fully.
- # This retry loop spins until all agents have been installed successfully.
  - name: Install agent
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 30
- max_attempts: 5
- retry_wait_seconds: 60
- command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
+ run: |
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
- # The agent installer on windows does not finish in time for this to work. To
- # work around this for now, retry after a minute if installing the module failed.
  - name: Install module
- uses: nick-invision/retry@v1
- with:
- timeout_minutes: 30
- max_attempts: 2
- retry_wait_seconds: 60
- command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
+ run: |
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
 
  - name: "Honeycomb: Record deployment times"
  if: ${{ always() }}
@@ -198,11 +185,13 @@ jobs:
  - name: Remove test environment
  if: ${{ always() }}
  run: |
- buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
- echo ::group::=== REQUEST ===
- cat request.json || true
- echo
- echo ::endgroup::
+ if [ -f inventory.yaml ]; then
+ buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
+ echo ::group::=== REQUEST ===
+ cat request.json || true
+ echo
+ echo ::endgroup::
+ fi
 
  - name: "Honeycomb: Record removal times"
  if: ${{ always() }}

diff --git a/metadata.json b/metadata.json
@@ -98,7 +98,7 @@
  }
  ],
  "description": "This module simply manages /etc/mdlj or the Windows Logon Message as a template, showing interpolation of system attributes",
- "template-url": "https://github.com/puppetlabs/pdk-templates#main",
- "template-ref": "heads/main-0-gd093482",
+ "template-url": "/home/david/git/pdk-templates/#master",
+ "template-ref": "heads/stop-retrying-0-g25a5cb8",
  "pdk-version": "1.18.1"
 }