Skip to content

Commit 7664bf8

Browse files
committed
Move promtail
1 parent 56a495f commit 7664bf8

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/actions/start-promtail/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
shell: bash
88
run: |
99
docker run -d \
10-
--name="promtail" \
10+
--name=promtail \
1111
-v "${{ github.workspace }}/test/dashboard/prep/promtail.yaml:/etc/promtail/config.yaml" \
1212
-v "${{ github.workspace }}/test/dashboard/logs:/var/log" \
1313
-e TEST_OUTDIR=test/dashboard/logs \

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ jobs:
165165
run: echo "START_TIME=$(date +"%Y-%m-%dT%H:%M:%S.%NZ")" >> ${GITHUB_ENV}
166166
- name: Create Directory
167167
run: mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}${{matrix.container.version}}/
168-
- name: Start Promtail
169-
uses: ./.github/actions/start-promtail
170168
- name: Run Integration Tests
171169
run: |
172170
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
@@ -175,6 +173,8 @@ jobs:
175173
- name: Generate Test Results
176174
if: always()
177175
run: bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}}/${{matrix.container.image}}${{matrix.container.version}} ${{github.workspace}}
176+
- name: Start Promtail
177+
uses: ./.github/actions/start-promtail
178178
- name: Container Output Logs
179179
if: failure()
180180
run: |
@@ -237,9 +237,6 @@ jobs:
237237
- name: Generate Test Results
238238
if: always()
239239
run: bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}}/${{matrix.container.image}}${{matrix.container.version}} ${{github.workspace}}
240-
- run: |
241-
find ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}${{matrix.container.version}}/ -type f -name "test.log" -o -name "result.json"
242-
cat ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}${{matrix.container.version}}/result.json
243240
- name: Container Output Logs
244241
if: failure()
245242
run: |

0 commit comments

Comments
 (0)