@@ -165,6 +165,8 @@ 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
168170 - name : Run Integration Tests
169171 run : |
170172 go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
@@ -173,8 +175,6 @@ jobs:
173175 - name : Generate Test Results
174176 if : always()
175177 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 : |
@@ -299,12 +299,21 @@ jobs:
299299 registry : ${{ secrets.REGISTRY_URL }}
300300 username : ${{ secrets.REGISTRY_USERNAME }}
301301 password : ${{ secrets.REGISTRY_PASSWORD }}
302+ - name : Set Start Time
303+ run : echo "START_TIME=$(date +"%Y-%m-%dT%H:%M:%S.%NZ")" >> ${GITHUB_ENV}
304+ - name : Create Directory
305+ run : mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}${{matrix.container.version}}/
306+ - name : Start Promtail
307+ uses : ./.github/actions/start-promtail
302308 - name : Run Integration Tests
303309 run : |
304310 go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
305311 CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
306312 OS_RELEASE="${{ matrix.container.release }}" IMAGE_PATH="${{ matrix.container.path }}" \
307- make official-image-integration-test
313+ make official-image-integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}${{matrix.container.version}}/raw_logs.log && exit "${PIPESTATUS[0]}"
314+ - name : Generate Test Results
315+ if : always()
316+ run : bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}}/${{matrix.container.image}}${{matrix.container.version}} ${{github.workspace}}
308317 - name : Container Output Logs
309318 if : failure()
310319 run : |
0 commit comments