forked from evolvingweb/puppet-apt
-
Notifications
You must be signed in to change notification settings - Fork 462
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #967 from puppetlabs/pdksync_gha-updates
pdksync - Update gha templates
- Loading branch information
Showing
8 changed files
with
130 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,45 +17,41 @@ jobs: | |
|
|
||
| steps: | ||
| - name: "Honeycomb: Start recording" | ||
| uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected] | ||
| uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 | ||
| with: | ||
| apikey: ${{ env.HONEYCOMB_WRITEKEY }} | ||
| dataset: ${{ env.HONEYCOMB_DATASET }} | ||
| job-status: ${{ job.status }} | ||
|
|
||
| - name: "Honeycomb: Start first step" | ||
| run: | | ||
| echo STEP_ID=0 >> $GITHUB_ENV | ||
| echo STEP_ID=setup-environment >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Checkout Source | ||
| uses: actions/checkout@v2 | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
|
|
||
| - name: Activate Ruby 2.7 | ||
| uses: actions/setup-ruby@v1 | ||
| uses: ruby/setup-ruby@v1 | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| with: | ||
| ruby-version: "2.7" | ||
| bundler-cache: true | ||
|
|
||
| - name: Cache gems | ||
| uses: actions/cache@v2 | ||
| - name: Print bundle environment | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| with: | ||
| path: vendor/gems | ||
| key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-${{ github.event_name }}- | ||
| ${{ runner.os }}- | ||
| run: | | ||
| echo ::group::bundler environment | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env | ||
| echo ::endgroup:: | ||
| - name: Install gems | ||
| - name: "Honeycomb: Record Setup Environment time" | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| run: | | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' | ||
| echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Setup Acceptance Test Matrix | ||
| id: get-matrix | ||
|
|
@@ -67,7 +63,7 @@ jobs: | |
| echo "::set-output name=matrix::{}" | ||
| fi | ||
| - name: "Honeycomb: Record setup time" | ||
| - name: "Honeycomb: Record Setup Test Matrix time" | ||
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix' | ||
|
|
@@ -90,7 +86,7 @@ jobs: | |
| echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE | ||
| - name: "Honeycomb: Start recording" | ||
| uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected] | ||
| uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 | ||
| with: | ||
| apikey: ${{ env.HONEYCOMB_WRITEKEY }} | ||
| dataset: ${{ env.HONEYCOMB_DATASET }} | ||
|
|
@@ -106,42 +102,22 @@ jobs: | |
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Activate Ruby 2.7 | ||
| uses: actions/setup-ruby@v1 | ||
| uses: ruby/setup-ruby@v1 | ||
| with: | ||
| ruby-version: "2.7" | ||
| bundler-cache: true | ||
|
|
||
| - name: Cache gems | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: vendor/gems | ||
| key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-${{ github.event_name }}- | ||
| ${{ runner.os }}- | ||
| - name: "Honeycomb: Record cache setup time" | ||
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Bundler Setup | ||
| - name: Print bundle environment | ||
| run: | | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean | ||
| echo ::group::bundler environment | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env | ||
| echo ::endgroup:: | ||
| - name: "Honeycomb: Record Bundler Setup time" | ||
| - name: "Honeycomb: Record Setup Environment time" | ||
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Provision test environment | ||
|
|
@@ -168,7 +144,7 @@ jobs: | |
| run: | | ||
| echo ::group::honeycomb step | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| echo ::endgroup:: | ||
|
|
@@ -180,11 +156,12 @@ jobs: | |
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Remove test environment | ||
| if: ${{ always() }} | ||
| continue-on-error: true | ||
| run: | | ||
| if [ -f inventory.yaml ]; then | ||
| buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down' | ||
|
|
@@ -207,7 +184,7 @@ jobs: | |
| runs-on: ubuntu-20.04 | ||
| steps: | ||
| - name: Slack Workflow Notification | ||
| uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master | ||
| uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1 | ||
| with: | ||
| # Required Input | ||
| repo_token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,64 +15,60 @@ jobs: | |
|
|
||
| steps: | ||
| - name: "Honeycomb: Start recording" | ||
| uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected] | ||
| uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 | ||
| with: | ||
| apikey: ${{ env.HONEYCOMB_WRITEKEY }} | ||
| dataset: ${{ env.HONEYCOMB_DATASET }} | ||
| job-status: ${{ job.status }} | ||
|
|
||
| - name: "Honeycomb: Start first step" | ||
| run: | | ||
| echo STEP_ID=0 >> $GITHUB_ENV | ||
| echo STEP_ID=setup-environment >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Checkout Source | ||
| uses: actions/checkout@v2 | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
|
|
||
| - name: Activate Ruby 2.7 | ||
| uses: actions/setup-ruby@v1 | ||
| uses: ruby/setup-ruby@v1 | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| with: | ||
| ruby-version: "2.7" | ||
| bundler-cache: true | ||
|
|
||
| - name: Cache gems | ||
| uses: actions/cache@v2 | ||
| - name: Print bundle environment | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| with: | ||
| path: vendor/gems | ||
| key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-${{ github.event_name }}- | ||
| ${{ runner.os }}- | ||
| run: | | ||
| echo ::group::bundler environment | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env | ||
| echo ::endgroup:: | ||
| - name: Install gems | ||
| - name: "Honeycomb: Record Setup Environment time" | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| run: | | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' | ||
| echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Setup Acceptance Test Matrix | ||
| id: get-matrix | ||
| if: ${{ github.repository_owner == 'puppetlabs' }} | ||
| run: | | ||
| if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then | ||
| buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata | ||
| else | ||
| echo "::set-output name=matrix::{}" | ||
| fi | ||
| - name: "Honeycomb: Record setup time" | ||
| - name: "Honeycomb: Record Setup Test Matrix time" | ||
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix' | ||
| Acceptance: | ||
| needs: | ||
| - setup_matrix | ||
| if: ${{ needs.setup_matrix.outputs.matrix != '{}' }} | ||
|
|
||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
|
|
@@ -88,7 +84,7 @@ jobs: | |
| echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE | ||
| - name: "Honeycomb: Start recording" | ||
| uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected] | ||
| uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 | ||
| with: | ||
| apikey: ${{ env.HONEYCOMB_WRITEKEY }} | ||
| dataset: ${{ env.HONEYCOMB_DATASET }} | ||
|
|
@@ -104,42 +100,22 @@ jobs: | |
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Activate Ruby 2.7 | ||
| uses: actions/setup-ruby@v1 | ||
| uses: ruby/setup-ruby@v1 | ||
| with: | ||
| ruby-version: "2.7" | ||
| bundler-cache: true | ||
|
|
||
| - name: Cache gems | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: vendor/gems | ||
| key: ${{ runner.os }}-${{ github.event_name }}-${{ hashFiles('**/Gemfile') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-${{ github.event_name }}- | ||
| ${{ runner.os }}- | ||
| - name: "Honeycomb: Record cache setup time" | ||
| if: ${{ always() }} | ||
| - name: Print bundle environment | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Cache retrieval' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Bundler Setup | ||
| run: | | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config path vendor/gems' -- bundle config path vendor/gems | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config jobs 8' -- bundle config jobs 8 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle config retry 3' -- bundle config retry 3 | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle install' -- bundle install | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle clean' -- bundle clean | ||
| echo ::group::bundler environment | ||
| buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env | ||
| echo ::endgroup:: | ||
| - name: "Honeycomb: Record Bundler Setup time" | ||
| - name: "Honeycomb: Record Setup Environment time" | ||
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Bundler Setup' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Provision test environment | ||
|
|
@@ -166,7 +142,7 @@ jobs: | |
| run: | | ||
| echo ::group::honeycomb step | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| echo ::endgroup:: | ||
|
|
@@ -178,11 +154,12 @@ jobs: | |
| if: ${{ always() }} | ||
| run: | | ||
| buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests' | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-5 >> $GITHUB_ENV | ||
| echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV | ||
| echo STEP_START=$(date +%s) >> $GITHUB_ENV | ||
| - name: Remove test environment | ||
| if: ${{ always() }} | ||
| continue-on-error: true | ||
| run: | | ||
| if [ -f inventory.yaml ]; then | ||
| buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down' | ||
|
|
||
Oops, something went wrong.