build-packages.yml: update for changes in download-packages action

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index d20532dc7b52df5423844d0e3328806ee89fee2f..92615db072c725cc54adf274d3f17d50d7c191c5 100644 (file)
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -344,6 +344,7 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           pattern: "${{ inputs.product }}-${{ matrix.os }}-${{ needs.build.outputs.version }}-${{ matrix.architecture }}"
+          path: files/
       - name: Normalize package name
         id: normalize-name
         run: |
@@ -360,16 +361,12 @@ jobs:
           fi
       - name: Extract and prepare files and packages
         run: |
-          # Prepare files folder
-          mkdir -p files/${{ steps.normalize-name.outputs.normalized-package-name }}/${{ needs.build.outputs.version }}
-          # Copy compressed and provenance files
-          cp ${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}/*/*/*-${{ matrix.architecture }}.tar.bz2 files/${{ steps.normalize-name.outputs.normalized-package-name }}/${{ needs.build.outputs.version }}/
           # Extract packages
-          for i in $(ls ./${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}/*/*/*${{ matrix.architecture }}.tar.bz2); do mkdir -p ./packages/$(echo $i | cut -d '/' -f 2)/; tar -xvf $i -C ./packages/$(echo $i | cut -d '/' -f 2)/ --transform='s/.*\///'; done
+          for i in $(ls ./files/*/*/*${{ matrix.architecture }}.tar.bz2); do mkdir -p ./packages/$(echo $i | cut -d '/' -f 2)/; tar -xvf $i -C ./packages/$(echo $i | cut -d '/' -f 2)/ --transform='s/.*\///'; done
           # Move RPM files
-          for i in $(ls ./packages/*/*.rpm); do f=$(echo $i | awk -F/ '{print $3}' | awk -F'${{ inputs.product }}-' '{print $2}' | awk -F'-${{ needs.build.outputs.version }}-' '{print $1"."$2}'); mkdir -p rpm_packages/${f}; mv $i rpm_packages/${f}/; done
+          for i in $(ls ./packages/*/*.rpm); do mkdir -p rpm_packages/${{ matrix.os }}.${{ matrix.architecture }}; mv $i rpm_packages/${{ matrix.os }}.${{ matrix.architecture }}/; done
           # Move deb files
-          for i in $(ls ./packages/*/*.deb); do mkdir -p deb_packages/$(echo $i | awk -F/ '{print $3}' | awk -F- '{print $2"-"$3}'); mv $i deb_packages/$(echo $i | awk -F/ '{print $3}' | awk -F- '{print $2"-"$3}'); done
+          for i in $(ls ./packages/*/*.deb); do mkdir -p deb_packages/${{ matrix.os }}; mv $i deb_packages/${{ matrix.os }}/; done
       - name: Upload DEB Packages
         if: ${{ contains(matrix.os, 'ubuntu-') || ( contains(matrix.os, 'debian-')) }}
         run: ${{ env.INV_CMD }} pulp-upload-deb-packages-by-folder deb_packages ${{ steps.normalize-name.outputs.normalized-product-name }}
@@ -415,6 +412,7 @@ jobs:
         uses: actions/download-artifact@v6
         with:
           pattern: "${{ inputs.product }}-${{ matrix.os }}-${{ needs.build.outputs.version }}-${{ matrix.architecture }}"
+          path: files/
       - name: Normalize package name
         id: normalize-name
         run: |
@@ -427,12 +425,8 @@ jobs:
           fi
       - name: Extract and prepare files and packages
         run: |
-          # Prepare files folder
-          mkdir -p files/${{ steps.normalize-name.outputs.normalized-package-name }}/${{ needs.build.outputs.version }}
-          # Copy compressed files
-          cp ${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}/*/*/*.tar.bz2 files/${{ steps.normalize-name.outputs.normalized-package-name }}/${{ needs.build.outputs.version }}/
           # Extract packages
-          for i in $(ls ./${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}/*/*/*${{ matrix.architecture }}.tar.bz2); do mkdir -p ./packages/$(echo $i | cut -d '/' -f 2)/; tar -xvf $i -C ./packages/$(echo $i | cut -d '/' -f 2)/ --transform='s/.*\///'; done
+          for i in $(ls ./files/*/*/*${{ matrix.architecture }}.tar.bz2); do mkdir -p ./packages/$(echo $i | cut -d '/' -f 2)/; tar -xvf $i -C ./packages/$(echo $i | cut -d '/' -f 2)/ --transform='s/.*\///'; done
           # Add file with list of dependencies
           for i in $(ls ./packages/*/*.json); do mv $i files/${{ steps.normalize-name.outputs.normalized-package-name }}/${{ needs.build.outputs.version }}/; done
       - name: Upload build data

diff --git a/tasks.py b/tasks.py
index 5261f4510bb0664dcea9a443a664721cc9e798d3..eca5f816e0864dd93a22195f6defc310b4acc1f2 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -1366,7 +1366,7 @@ def pulp_create_deb_publication(c):
                 break
             except UnexpectedExit:
                 attempts += 1
-                time.sleep(5)
+                time.sleep(20)
                 print(f'Next attempt: {attempts}')
                 if attempts == max_push_attempts:
                     raise Failure(f'Error creating deb publication')
@@ -1396,7 +1396,7 @@ def get_pulp_repository_href(c, repo_name, repo_type):
 def is_pulp_task_completed(c, task_href):
     elapsed_time = 0
     check_interval = 5
-    max_wait_time = 60
+    max_wait_time = 300
 
     while elapsed_time < max_wait_time:
         cmd = f"task show --href {task_href} | jq -r .state | tr -d '\n'"