Skip to content

Commit ce02cee

Browse files
authored
Merge pull request #378 from puppetlabs/pdksync
Update to puppet-module-gems 1.0, pdk-templates and new rubocop
2 parents abba7aa + e12c15b commit ce02cee

File tree

12 files changed

+457
-112
lines changed

12 files changed

+457
-112
lines changed

.github/workflows/nightly.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: "Honeycomb: Start recording"
21-
uses: kvrhdn/gha-buildevents@v1.0.2
21+
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
2222
with:
2323
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
2424
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -91,7 +91,7 @@ jobs:
9191
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
9292
9393
- name: "Honeycomb: Start recording"
94-
uses: kvrhdn/gha-buildevents@v1.0.2
94+
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
9595
with:
9696
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9797
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -156,26 +156,13 @@ jobs:
156156
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
157157
echo ::endgroup::
158158
159-
# The provision service hands out machines as soon as they're provisioned.
160-
# The GCP VMs might still take a while to spool up and configure themselves fully.
161-
# This retry loop spins until all agents have been installed successfully.
162159
- name: Install agent
163-
uses: nick-invision/retry@v1
164-
with:
165-
timeout_minutes: 30
166-
max_attempts: 5
167-
retry_wait_seconds: 60
168-
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
160+
run: |
161+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
169162
170-
# The agent installer on windows does not finish in time for this to work. To
171-
# work around this for now, retry after a minute if installing the module failed.
172163
- name: Install module
173-
uses: nick-invision/retry@v1
174-
with:
175-
timeout_minutes: 30
176-
max_attempts: 2
177-
retry_wait_seconds: 60
178-
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
164+
run: |
165+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
179166
180167
- name: "Honeycomb: Record deployment times"
181168
if: ${{ always() }}
@@ -221,7 +208,7 @@ jobs:
221208
runs-on: ubuntu-20.04
222209
steps:
223210
- name: Slack Workflow Notification
224-
uses: Gamesight/slack-workflow-status@master
211+
uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
225212
with:
226213
# Required Input
227214
repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr_test.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: "Honeycomb: Start recording"
19-
uses: kvrhdn/gha-buildevents@v1.0.2
19+
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
2020
with:
2121
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
2222
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -89,7 +89,7 @@ jobs:
8989
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
9090
9191
- name: "Honeycomb: Start recording"
92-
uses: kvrhdn/gha-buildevents@v1.0.2
92+
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # pin@v1.0.2
9393
with:
9494
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9595
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -154,26 +154,13 @@ jobs:
154154
sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
155155
echo ::endgroup::
156156
157-
# The provision service hands out machines as soon as they're provisioned.
158-
# The GCP VMs might still take a while to spool up and configure themselves fully.
159-
# This retry loop spins until all agents have been installed successfully.
160157
- name: Install agent
161-
uses: nick-invision/retry@v1
162-
with:
163-
timeout_minutes: 30
164-
max_attempts: 5
165-
retry_wait_seconds: 60
166-
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
158+
run: |
159+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
167160
168-
# The agent installer on windows does not finish in time for this to work. To
169-
# work around this for now, retry after a minute if installing the module failed.
170161
- name: Install module
171-
uses: nick-invision/retry@v1
172-
with:
173-
timeout_minutes: 30
174-
max_attempts: 2
175-
retry_wait_seconds: 60
176-
command: buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
162+
run: |
163+
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
177164
178165
- name: "Honeycomb: Record deployment times"
179166
if: ${{ always() }}

0 commit comments

Comments
 (0)