Skip to content

Commit 0a8ecc6

Browse files
author
jordanbreen28
committed
(CONT-172) - Remove honeycomb
1 parent e40dc66 commit 0a8ecc6

File tree

2 files changed

+22
-151
lines changed

2 files changed

+22
-151
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,19 @@ on:
66
- "main"
77
workflow_dispatch:
88

9-
env:
10-
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
11-
HONEYCOMB_DATASET: litmus tests
12-
139
jobs:
1410
Spec:
1511
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
1612
secrets: "inherit"
1713

1814
Integration:
1915
needs: "Spec"
20-
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
21-
2216
runs-on: ubuntu-20.04
2317
strategy:
2418
fail-fast: false
2519
matrix: {'platform':['centos-7'],'collection':['puppet6-nightly', 'puppet7-nightly']}
2620

27-
env:
28-
BUILDEVENT_FILE: '../buildevents.txt'
29-
3021
steps:
31-
- run: |
32-
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
33-
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
34-
- name: "Honeycomb: Start recording"
35-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
36-
with:
37-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
38-
dataset: ${{ env.HONEYCOMB_DATASET }}
39-
job-status: ${{ job.status }}
40-
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
41-
42-
- name: "Honeycomb: start first step"
43-
run: |
44-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
45-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
4622
- name: Checkout Source
4723
uses: actions/checkout@v2
4824

@@ -55,81 +31,40 @@ jobs:
5531
- name: Print bundle environment
5632
run: |
5733
echo ::group::bundler environment
58-
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
34+
bundle env
5935
echo ::endgroup::
36+
6037
- name: Create the fixtures directory
6138
run: |
6239
echo ::group::Create the fixtures directory
63-
buildevents cmd $TRACE_ID $STEP_ID 'bundle exec rake spec_prep' -- bundle exec rake spec_prep
40+
bundle exec rake spec_prep
6441
echo ::endgroup::
65-
- name: "Honeycomb: Record Setup Environment time"
66-
if: ${{ always() }}
67-
run: |
68-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
69-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
70-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
42+
7143
- name: Provision test environment
7244
run: |
73-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster image_type=${{ matrix.platform }}
74-
echo ::group::=== REQUEST ===
75-
cat request.json || true
76-
echo
77-
echo ::endgroup::
78-
echo ::group::=== INVENTORY ===
79-
if [ -f 'spec/fixtures/litmus_inventory.yaml' ]; then
80-
FILE='spec/fixtures/litmus_inventory.yaml'
81-
elif [ -f 'inventory.yaml' ]; then
82-
FILE='inventory.yaml'
83-
fi
45+
bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster image_type=${{ matrix.platform }}
46+
FILE='spec/fixtures/litmus_inventory.yaml'
8447
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
85-
echo ::endgroup::
8648
echo INVENTORY_PATH=$FILE >> $GITHUB_ENV
8749
8850
- name: Puppet server setup
8951
run: |
90-
buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes::puppetserver_setup' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup collection='${{ matrix.collection }}' -i ./$INVENTORY_PATH
52+
bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup collection='${{ matrix.collection }}' -i ./$INVENTORY_PATH
9153
9254
- name: Install agent
9355
run: |
94-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
56+
bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
9557
9658
- name: Install module
9759
run: |
98-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
99-
100-
- name: "Honeycomb: Record deployment times"
101-
if: ${{ always() }}
102-
run: |
103-
echo ::group::honeycomb step
104-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
105-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
106-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
107-
echo ::endgroup::
60+
bundle exec rake 'litmus:install_module'
10861
10962
- name: Run integration tests
11063
run: |
111-
buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes:integration' -- bundle exec rake kubernetes:integration
112-
113-
- name: "Honeycomb: Record integration testing times"
114-
if: ${{ always() }}
115-
run: |
116-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run integration tests'
117-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
118-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
64+
bundle exec rake kubernetes:integration
11965
12066
- name: Remove test environment
12167
if: ${{ always() }}
12268
continue-on-error: true
12369
run: |
124-
if [ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]; then
125-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
126-
echo ::group::=== REQUEST ===
127-
cat request.json || true
128-
echo
129-
echo ::endgroup::
130-
fi
131-
132-
- name: "Honeycomb: Record removal times"
133-
if: ${{ always() }}
134-
run: |
135-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
70+
bundle exec rake 'litmus:tear_down'

‎.github/workflows/nightly.yml‎

Lines changed: 11 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,19 @@ on:
44
schedule:
55
- cron: '0 0 * * *'
66

7-
env:
8-
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
9-
HONEYCOMB_DATASET: litmus tests
10-
117
jobs:
128
Spec:
139
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
1410
secrets: "inherit"
1511

1612
Integration:
1713
needs: "Spec"
18-
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
19-
2014
runs-on: ubuntu-20.04
2115
strategy:
2216
fail-fast: false
2317
matrix: {'platform':['centos-7'],'collection':['puppet6-nightly', 'puppet7-nightly']}
2418

25-
env:
26-
BUILDEVENT_FILE: '../buildevents.txt'
27-
2819
steps:
29-
- run: |
30-
echo 'platform=${{ matrix.platform }}' >> $BUILDEVENT_FILE
31-
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
32-
- name: "Honeycomb: Start recording"
33-
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
34-
with:
35-
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
36-
dataset: ${{ env.HONEYCOMB_DATASET }}
37-
job-status: ${{ job.status }}
38-
matrix-key: ${{ matrix.platform }}-${{ matrix.collection }}
39-
40-
- name: "Honeycomb: start first step"
41-
run: |
42-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
43-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
4420
- name: Checkout Source
4521
uses: actions/checkout@v2
4622

@@ -53,81 +29,41 @@ jobs:
5329
- name: Print bundle environment
5430
run: |
5531
echo ::group::bundler environment
56-
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
32+
bundle env
5733
echo ::endgroup::
34+
5835
- name: Create the fixtures directory
5936
run: |
6037
echo ::group::Create the fixtures directory
61-
buildevents cmd $TRACE_ID $STEP_ID 'bundle exec rake spec_prep' -- bundle exec rake spec_prep
38+
bundle exec rake spec_prep
6239
echo ::endgroup::
63-
- name: "Honeycomb: Record Setup Environment time"
64-
if: ${{ always() }}
65-
run: |
66-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
67-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
68-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
40+
6941
- name: Provision test environment
7042
run: |
71-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster image_type=${{ matrix.platform }}
72-
echo ::group::=== REQUEST ===
73-
cat request.json || true
74-
echo
75-
echo ::endgroup::
76-
echo ::group::=== INVENTORY ===
77-
if [ -f 'spec/fixtures/litmus_inventory.yaml' ]; then
78-
FILE='spec/fixtures/litmus_inventory.yaml'
79-
elif [ -f 'inventory.yaml' ]; then
80-
FILE='inventory.yaml'
81-
fi
43+
bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster image_type=${{ matrix.platform }}
44+
FILE='spec/fixtures/litmus_inventory.yaml'
8245
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
83-
echo ::endgroup::
8446
echo INVENTORY_PATH=$FILE >> $GITHUB_ENV
8547
8648
- name: Puppet server setup
8749
run: |
88-
buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes::puppetserver_setup' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup collection='${{ matrix.collection }}' -i ./$INVENTORY_PATH
50+
bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup collection='${{ matrix.collection }}' -i ./$INVENTORY_PATH
8951
9052
- name: Install agent
9153
run: |
92-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
54+
bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
9355
9456
- name: Install module
9557
run: |
96-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
97-
98-
- name: "Honeycomb: Record deployment times"
99-
if: ${{ always() }}
100-
run: |
101-
echo ::group::honeycomb step
102-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
103-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
104-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
105-
echo ::endgroup::
58+
bundle exec rake 'litmus:install_module'
10659
10760
- name: Run integration tests
10861
run: |
109-
buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes:integration' -- bundle exec rake kubernetes:integration
110-
111-
- name: "Honeycomb: Record integration testing times"
112-
if: ${{ always() }}
113-
run: |
114-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run integration tests'
115-
echo STEP_ID=${{ matrix.platform }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
116-
echo STEP_START=$(date +%s) >> $GITHUB_ENV
62+
bundle exec rake kubernetes:integration
11763
11864
- name: Remove test environment
11965
if: ${{ always() }}
12066
continue-on-error: true
12167
run: |
122-
if [ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]; then
123-
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
124-
echo ::group::=== REQUEST ===
125-
cat request.json || true
126-
echo
127-
echo ::endgroup::
128-
fi
68+
bundle exec rake 'litmus:tear_down'
12969
130-
- name: "Honeycomb: Record removal times"
131-
if: ${{ always() }}
132-
run: |
133-
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'

0 commit comments

Comments
 (0)