Skip to content

Commit

Permalink
Merge pull request garethr#701 from puppetlabs/pdksync
Browse files Browse the repository at this point in the history
Update to puppet-module-gems 1.0, pdk-templates and new rubocop
  • Loading branch information
sanfrancrisko authored Jan 4, 2021
2 parents cd733e9 + 8399c49 commit 0aeec08
Show file tree
Hide file tree
Showing 79 changed files with 1,421 additions and 539 deletions.
27 changes: 7 additions & 20 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: "Honeycomb: Start recording"
uses: kvrhdn/[email protected]
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording"
uses: kvrhdn/[email protected]
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
Expand Down Expand Up @@ -155,26 +155,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() }}
Expand Down Expand Up @@ -220,7 +207,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Slack Workflow Notification
uses: Gamesight/slack-workflow-status@master
uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
with:
# Required Input
repo_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
25 changes: 6 additions & 19 deletions .github/workflows/pr_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: "Honeycomb: Start recording"
uses: kvrhdn/[email protected]
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording"
uses: kvrhdn/[email protected]
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
Expand Down Expand Up @@ -153,26 +153,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() }}
Expand Down
Loading

0 comments on commit 0aeec08

Please sign in to comment.