Merge pull request #313 from lool/s3-upload-fixes

S3 upload fixes

Author: lool

.github/workflows/build-overlay-deb.yml

@@ -95,4 +95,7 @@ jobs:
         uses: qualcomm-linux/upload-private-artifact-action@aws-v4
         with:
           path: upload
+          # these should be the defaults; or ought to reuse BUILD_ID
+          s3_bucket: qcom-prd-gh-artifacts
+          destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/
 

.github/workflows/debos.yml

@@ -178,10 +178,10 @@ jobs:
         uses: qualcomm-linux/upload-private-artifact-action@aws-v4
         id: upload_artifacts_s3
         with:
+          path: debos-artifacts
+          # these should be the defaults; or ought to reuse BUILD_ID
           s3_bucket: qcom-prd-gh-artifacts
-          # should be the default in that action, or ought to reuse BUILD_ID
           destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/
-          path: debos-artifacts
 
       - name: Unpack rootfs to generate SBOM
         run: mkdir -v rootfs && tar -C rootfs -xf rootfs.tar
@@ -227,10 +227,14 @@ jobs:
           cp -av rootfs-sbom.*.gz sboms
 
       - name: Upload SBOMs as private artifacts
-        uses: qualcomm-linux/upload-private-artifact-action@v1
+        uses: qualcomm-linux/upload-private-artifact-action@aws-v4
         id: upload_sbom_artifacts
         with:
           path: sboms
+          # these should be the defaults; or ought to reuse BUILD_ID
+          s3_bucket: qcom-prd-gh-artifacts
+          destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/
+
       - name: "Print output"
         env:
           build_url: ${{ steps.upload_artifacts_s3.outputs.url }}

.github/workflows/linux.yml

@@ -52,8 +52,6 @@ permissions:
   pull-requests: write # lava-test.yml
 
 env:
-  # where results will be posted/hosted
-  FILESERVER_URL: https://quic-yocto-fileserver-1029608027416.us-central1.run.app
   # github runs are only unique per repository and may also be re-run; create a
   # build id for the current run
   BUILD_ID: ${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt }}
@@ -135,6 +133,9 @@ jobs:
         id: upload_artifacts
         with:
           path: artifacts
+          # these should be the defaults; or ought to reuse BUILD_ID
+          s3_bucket: qcom-prd-gh-artifacts
+          destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/
 
   debos-linux-deb:
     needs: build-linux-deb

.github/workflows/u-boot.yml

@@ -12,8 +12,6 @@ permissions:
   contents: read # actions/checkout
 
 env:
-  # where results will be posted/hosted
-  FILESERVER_URL: https://quic-yocto-fileserver-1029608027416.us-central1.run.app
   # github runs are only unique per repository and may also be re-run; create a
   # build id for the current run
   BUILD_ID: ${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt }}
@@ -95,4 +93,7 @@ jobs:
         id: upload_artifacts
         with:
           path: artifacts
+          # these should be the defaults; or ought to reuse BUILD_ID
+          s3_bucket: qcom-prd-gh-artifacts
+          destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/