Skip to content

Commit 8d2e214

Browse files
committed
update integration tests
1 parent 0f82539 commit 8d2e214

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,17 @@ jobs:
164164
- name: Set Start Time
165165
run: echo "START_TIME=$(date +"%Y-%m-%dT%H:%M:%S.%NZ")" >> ${GITHUB_ENV}
166166
- name: Create Directory for Results
167-
run: mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/
167+
run: mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}
168168
- name: Start Promtail
169169
uses: ./.github/actions/start-promtail
170170
- name: Run Integration Tests
171171
run: |
172-
mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/
172+
mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}
173173
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
174174
OS_RELEASE="${{ matrix.container.image }}" OS_VERSION="${{ matrix.container.version }}" \
175-
make integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/raw_logs.log && exit "${PIPESTATUS[0]}"
175+
make integration-test | tee ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/raw_logs.log && exit "${PIPESTATUS[0]}" \
176+
echo "THIS IS A DEBUG LINE" \
177+
cat ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/raw_logs.log
176178
- name: Generate Test Results
177179
if: always()
178180
run: bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}} ${{ github.workspace }}
@@ -219,26 +221,16 @@ jobs:
219221
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
220222
with:
221223
go-version-file: 'go.mod'
222-
- name: Set Start Time
223-
run: echo "START_TIME=$(date +"%Y-%m-%dT%H:%M:%S.%NZ")" >> ${GITHUB_ENV}
224-
- name: Create Directory for Results
225-
run: mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/
226-
- name: Start Promtail
227-
uses: ./.github/actions/start-promtail
228224
- name: Download Packages
229225
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
230226
with:
231227
name: nginx-agent-unsigned-snapshots
232228
path: build
233229
- name: Run Integration Tests
234230
run: |
235-
mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/
236231
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
237232
CONTAINER_NGINX_IMAGE_REGISTRY="${{ env.NGINX_OSS_REGISTRY }}" TAG="${{ matrix.container.version }}-${{ matrix.container.image }}" OS_RELEASE="${{ matrix.container.release }}"\
238-
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]}"
239-
- name: Generate Test Results
240-
if: always()
241-
run: bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}}
233+
make official-image-integration-test
242234
- name: Container Output Logs
243235
if: failure()
244236
run: |
@@ -295,12 +287,6 @@ jobs:
295287
with:
296288
name: nginx-agent-unsigned-snapshots
297289
path: build
298-
- name: Set Start Time
299-
run: echo "START_TIME=$(date +"%Y-%m-%dT%H:%M:%S.%NZ")" >> ${GITHUB_ENV}
300-
- name: Create Directory for Results
301-
run: mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/
302-
- name: Start Promtail
303-
uses: ./.github/actions/start-promtail
304290
- name: Login to Docker Registry
305291
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
306292
with:
@@ -309,14 +295,10 @@ jobs:
309295
password: ${{ secrets.REGISTRY_PASSWORD }}
310296
- name: Run Integration Tests
311297
run: |
312-
mkdir -p ${{github.workspace}}/test/dashboard/logs/${{github.job}}/${{matrix.container.image}}.${{matrix.container.version}}/
313298
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
314299
CONTAINER_NGINX_IMAGE_REGISTRY="${{ secrets.REGISTRY_URL }}" TAG="${{ matrix.container.plus }}-${{ matrix.container.image }}-${{ matrix.container.version }}" \
315300
OS_RELEASE="${{ matrix.container.release }}" IMAGE_PATH="${{ matrix.container.path }}" \
316-
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]}"
317-
- name: Generate Test Results
318-
if: always()
319-
run: bash ./scripts/workflow/generate_results.sh ${{job.status}} ${{env.START_TIME}} ${{github.job}}
301+
make official-image-integration-test
320302
- name: Container Output Logs
321303
if: failure()
322304
run: |

0 commit comments

Comments
 (0)