From 0a7da668d5856d23f3cbd668ca5021d253ecc9bd Mon Sep 17 00:00:00 2001 From: Elaine McCloskey Date: Wed, 8 Mar 2023 12:41:16 +0000 Subject: [PATCH 1/4] Testing removing honeycomb (DO NOT MERGE) --- .github/workflows/pe_lts_testing.yml | 73 +--------------------------- 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/.github/workflows/pe_lts_testing.yml b/.github/workflows/pe_lts_testing.yml index edb17ca..1082bac 100644 --- a/.github/workflows/pe_lts_testing.yml +++ b/.github/workflows/pe_lts_testing.yml @@ -4,10 +4,6 @@ on: workflow_dispatch: workflow_call: -env: - HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6 - HONEYCOMB_DATASET: litmus tests - jobs: setup_matrix: name: "Setup Test Matrix" @@ -16,20 +12,6 @@ jobs: matrix: ${{ steps.get-matrix.outputs.matrix }} steps: - - name: "Honeycomb: Start recording" - 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=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: ruby/setup-ruby@v1 @@ -44,12 +26,6 @@ jobs: echo ::group::bundler environment buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env echo ::endgroup:: - - name: "Honeycomb: Record Setup Environment time" - if: ${{ github.repository_owner == 'puppetlabs' }} - run: | - 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 # Store the result of the curl call in $forge_response - name: Curl Forge for PE versions @@ -73,11 +49,6 @@ jobs: echo "::set-output name=matris::{}" fi - - name: "Honeycomb: Record Setup Test Matrix time" - if: ${{ always() }} - run: | - buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix' - Acceptance: name: "${{matrix.platforms.label}}, ${{matrix.collection}}" needs: @@ -93,25 +64,6 @@ jobs: BUILDEVENT_FILE: '../buildevents.txt' steps: - - run: | - echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE - echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE - echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE - - name: "Honeycomb: Start recording" - uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1 - with: - apikey: ${{ env.HONEYCOMB_WRITEKEY }} - dataset: ${{ env.HONEYCOMB_DATASET }} - job-status: ${{ job.status }} - matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }} - - - name: "Honeycomb: start first step" - run: | - echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV - echo STEP_START=$(date +%s) >> $GITHUB_ENV - - name: Checkout Source - uses: actions/checkout@v2 - - name: Activate Ruby 2.7 uses: ruby/setup-ruby@v1 with: @@ -123,12 +75,6 @@ jobs: echo ::group::bundler environment buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env echo ::endgroup:: - - name: "Honeycomb: Record Setup Environment time" - if: ${{ always() }} - run: | - buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment' - echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV - echo STEP_START=$(date +%s) >> $GITHUB_ENV - name: Provision test environment run: | buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]' @@ -154,23 +100,9 @@ jobs: - name: 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() }} - run: | - echo ::group::honeycomb step - buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system' - echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV - echo STEP_START=$(date +%s) >> $GITHUB_ENV - echo ::endgroup:: - name: Run acceptance tests run: | buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel' - - name: "Honeycomb: Record acceptance testing times" - if: ${{ always() }} - run: | - buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests' - echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV - echo STEP_START=$(date +%s) >> $GITHUB_ENV - name: Remove test environment if: ${{ always() }} continue-on-error: true @@ -182,7 +114,4 @@ jobs: echo echo ::endgroup:: fi - - name: "Honeycomb: Record removal times" - if: ${{ always() }} - run: | - buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment' + From 5f7361e6ddd6fed1f032f4fce3c40f9eb7a5830f Mon Sep 17 00:00:00 2001 From: Elaine McCloskey Date: Wed, 8 Mar 2023 13:41:59 +0000 Subject: [PATCH 2/4] Remove bundler steps --- .github/workflows/pe_lts_testing.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/pe_lts_testing.yml b/.github/workflows/pe_lts_testing.yml index 1082bac..4ed893b 100644 --- a/.github/workflows/pe_lts_testing.yml +++ b/.github/workflows/pe_lts_testing.yml @@ -20,13 +20,6 @@ jobs: ruby-version: "2.7" bundler-cache: true - - name: Print bundle environment - if: ${{ github.repository_owner == 'puppetlabs' }} - run: | - echo ::group::bundler environment - buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env - echo ::endgroup:: - # Store the result of the curl call in $forge_response - name: Curl Forge for PE versions id: curl_forge @@ -70,11 +63,6 @@ jobs: ruby-version: "2.7" bundler-cache: true - - name: Print bundle environment - run: | - echo ::group::bundler environment - buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env - echo ::endgroup:: - name: Provision test environment run: | buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]' From 4e4316128f149ea074a147739b6d3bb51687d626 Mon Sep 17 00:00:00 2001 From: Elaine McCloskey Date: Wed, 8 Mar 2023 14:00:55 +0000 Subject: [PATCH 3/4] testing workflows --- .github/workflows/pe_lts_testing.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/pe_lts_testing.yml b/.github/workflows/pe_lts_testing.yml index 4ed893b..e0b56b9 100644 --- a/.github/workflows/pe_lts_testing.yml +++ b/.github/workflows/pe_lts_testing.yml @@ -13,6 +13,10 @@ jobs: steps: + - name: Checkout Source + uses: actions/checkout@v2 + if: ${{ github.repository_owner == 'puppetlabs' }} + - name: Activate Ruby 2.7 uses: ruby/setup-ruby@v1 if: ${{ github.repository_owner == 'puppetlabs' }} @@ -57,6 +61,9 @@ jobs: BUILDEVENT_FILE: '../buildevents.txt' steps: + - name: Checkout Source + uses: actions/checkout@v2 + - name: Activate Ruby 2.7 uses: ruby/setup-ruby@v1 with: From e18a30489666bfffd01c69f5cac0483428a29be7 Mon Sep 17 00:00:00 2001 From: Elaine McCloskey Date: Wed, 8 Mar 2023 14:08:53 +0000 Subject: [PATCH 4/4] testing --- .github/workflows/pe_lts_testing.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pe_lts_testing.yml b/.github/workflows/pe_lts_testing.yml index e0b56b9..ee84e89 100644 --- a/.github/workflows/pe_lts_testing.yml +++ b/.github/workflows/pe_lts_testing.yml @@ -24,6 +24,13 @@ jobs: ruby-version: "2.7" bundler-cache: true + - name: Print bundle environment + if: ${{ github.repository_owner == 'puppetlabs' }} + run: | + echo ::group::bundler environment + buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env + echo ::endgroup:: + # Store the result of the curl call in $forge_response - name: Curl Forge for PE versions id: curl_forge @@ -63,13 +70,19 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v2 - + - name: Activate Ruby 2.7 uses: ruby/setup-ruby@v1 with: ruby-version: "2.7" bundler-cache: true + - name: Print bundle environment + run: | + echo ::group::bundler environment + buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env + echo ::endgroup:: + - name: Provision test environment run: | buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'