Merge pull request #5192 from jkonecny12/master-fix-logs-collection-i…

…n-gh-live-iso-build Fix logs collection in GH live iso build
rhinstaller · Sep 22, 2023 · 2a0c987 · 2a0c987
2 parents 98e1811 + 3600676
commit 2a0c987
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -261,6 +261,7 @@ jobs:
           mkdir -p images
           make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG
           mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso"
+          mv result/iso/logs images/
 
       - name: Make artefacts created by sudo cleanable
         if: always()
@@ -273,7 +274,7 @@ jobs:
         with:
           name: 'logs'
           path: |
-           images/*.log
+           images/logs/*
 
       - name: Upload image artifacts
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/build-image.yml.j2 b/.github/workflows/build-image.yml.j2
@@ -255,6 +255,7 @@ jobs:
           mkdir -p images
           make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG
           mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso"
+          mv result/iso/logs images/
 
       - name: Make artefacts created by sudo cleanable
         if: always()
@@ -267,7 +268,7 @@ jobs:
         with:
           name: 'logs'
           path: |
-           images/*.log
+           images/logs/*
 
       - name: Upload image artifacts
         uses: actions/upload-artifact@v3