Skip to content

Commit d5e262c

Browse files
NazmiAltunNazmiAltun
committed
fix(ci diagnostic logs): Diagnostic logs are missing from the uploaded CI asset
docker-diagnose cannot collect docker-compose logs due to missing -p arg. docker-diagnose script v1.8 should fix it
1 parent a23e9fb commit d5e262c

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

‎.gflows/libs/job_integration_test.lib.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
include-compose: true
3030
encrypt-password: #@ security.generate_diagnostic_password(integration_test_definition)
3131
compose-file: #@ integration_test_definition.compose_file
32+
project-name: integration-test
3233
- #@ bpsteps.upload_artifacts_step("investigate/*","{} environment diagnostics".format(integration_test_definition.name) )
3334
- #@ bpsteps.upload_artifacts_step(cfg.get_file_upload_path(integration_test_definition),"{} results".format(integration_test_definition.name))
3435
#@ if getattr(integration_test_definition,"enable_junit_test_check",True) :

‎.gflows/libs/steps.lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ with:
4949
"covergo/[email protected]",
5050
"covergo/[email protected]",
5151
"covergo/[email protected]",
52-
"covergo/docker-diagnose@v1.5",
52+
"covergo/docker-diagnose@v1.8",
5353
"covergo/[email protected]",
5454
"covergo/run-in-compose@v1"
5555
]'

‎github-sample/workflows/build-publish.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Checkout GitHub Action Repos
3333
uses: daspn/private-actions-checkout@v2
3434
with:
35-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
35+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
3636
checkout_base_path: ./.github/actions
3737
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
3838
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -152,7 +152,7 @@ jobs:
152152
- name: Checkout GitHub Action Repos
153153
uses: daspn/private-actions-checkout@v2
154154
with:
155-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
155+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
156156
checkout_base_path: ./.github/actions
157157
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
158158
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -223,7 +223,7 @@ jobs:
223223
- name: Checkout GitHub Action Repos
224224
uses: daspn/private-actions-checkout@v2
225225
with:
226-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
226+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
227227
checkout_base_path: ./.github/actions
228228
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
229229
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -350,7 +350,7 @@ jobs:
350350
- name: Checkout GitHub Action Repos
351351
uses: daspn/private-actions-checkout@v2
352352
with:
353-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
353+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
354354
checkout_base_path: ./.github/actions
355355
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
356356
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -423,7 +423,7 @@ jobs:
423423
- name: Checkout GitHub Action Repos
424424
uses: daspn/private-actions-checkout@v2
425425
with:
426-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
426+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
427427
checkout_base_path: ./.github/actions
428428
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
429429
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -467,6 +467,7 @@ jobs:
467467
include-compose: true
468468
encrypt-password: 123
469469
compose-file: docker-compose.yml
470+
project-name: integration-test
470471
- name: Upload Integration tests environment diagnostics as artifact
471472
if: always()
472473
uses: actions/upload-artifact@v2
@@ -543,7 +544,7 @@ jobs:
543544
- name: Checkout GitHub Action Repos
544545
uses: daspn/private-actions-checkout@v2
545546
with:
546-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
547+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
547548
checkout_base_path: ./.github/actions
548549
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
549550
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -587,6 +588,7 @@ jobs:
587588
include-compose: true
588589
encrypt-password: 123
589590
compose-file: docker-compose.yml
591+
project-name: integration-test
590592
- name: Upload Acceptance tests environment diagnostics as artifact
591593
if: always()
592594
uses: actions/upload-artifact@v2
@@ -676,7 +678,7 @@ jobs:
676678
- name: Checkout GitHub Action Repos
677679
uses: daspn/private-actions-checkout@v2
678680
with:
679-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
681+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
680682
checkout_base_path: ./.github/actions
681683
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
682684
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}
@@ -720,6 +722,7 @@ jobs:
720722
include-compose: true
721723
encrypt-password: ${{ secrets.DIAGNOSTIC_PASSWORD }}$GITHUB_RUN_NUMBER
722724
compose-file: docker-compose.mariadb.yml
725+
project-name: integration-test
723726
- name: Upload Integration API tests environment diagnostics as artifact
724727
if: always()
725728
uses: actions/upload-artifact@v2
@@ -814,7 +817,7 @@ jobs:
814817
- name: Checkout GitHub Action Repos
815818
uses: daspn/private-actions-checkout@v2
816819
with:
817-
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.5", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
820+
actions_list: '[ "covergo/[email protected]", "covergo/[email protected]", "covergo/[email protected]", "covergo/docker-diagnose@v1.8", "covergo/[email protected]", "covergo/run-in-compose@v1" ]'
818821
checkout_base_path: ./.github/actions
819822
app_id: ${{ secrets.PRIVATE_ACTION_APP_ID }}
820823
app_private_key: ${{ secrets.PRIVATE_ACTION_APP_PRIVATE_KEY }}

0 commit comments

Comments
 (0)