Various fixes to allow the daily update-driver-submodules workflow to complete.

.github/workflows/update-driver-submodules.yml

@@ -18,6 +18,17 @@ jobs:
           submodules: true
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
+          persist-credentials: true
+
+      - name: Install rpm
+        run: |
+          sudo apt-get install -y rpm
+
+      - name: Configure git credentials for xcp-ng/driver-sources
+        env:
+          XCP_NG_RPMS_PAT: ${{ secrets.XCP_NG_RPMS_PAT }}
+        run: |
+          git config --global url."https://x-access-token:${XCP_NG_RPMS_PAT}@github.com/xcp-ng/driver-sources".insteadOf "git@github.com:xcp-ng/driver-sources"
 
       - name: Update driver submodules to origin/8.3
         id: update
@@ -45,25 +56,18 @@ jobs:
               # Missing sources, we need to add the sub-module as well as import its sources
               {
                 # Add the source sub-module
-                git submodule add git@github.com/xcpng-rpms/$(basename "$submodule").git "drivers/8.3/source/$(basename "submodule")"
+                git submodule add -b source/8.3 git@github.com:xcp-ng/driver-sources.git "drivers/8.3/source/$(basename "submodule")"
 
                 # Import the sources
                 cd "$submodule"
-                #   git-import-srpm needs a source/8.3 branch to import the sources as base onto point
-                cur_rev=$(git rev-parse HEAD)
-                git checkout --orphan source/8.3
-                git rm -rf
-                git commit --allow-empty -m "Initial commit."
-                git push origin source/8.3
-                git checkout ${cur_rev}
-                #   actually do the import now
+
                 branch=$(OOT_DRIVER_IMPORT=y ../../../../scripts/git-import-srpm HEAD | sed -n 's/.*Constructing \([^ ]\+\) from rev HEAD/\1/p')
                 cd -
 
                 # Push the source branch and update source sub-module
                 cd "$src_submodule"
                 git checkout $branch^0
-                git push origin $branch
+                git push origin $branch ${branch%patched}source
                 missing_sources+=("$src_submodule")
 
                 cd -
@@ -81,6 +85,8 @@ jobs:
                 if [ "$(git rev-parse HEAD)" != "$(git rev-parse $branch)" ]; then
                   # Sources are stale, refresh them from the above import
                   git checkout $branch^0
+                  # And push them
+                  git push -f origin ${branch} ${branch%patched}source
                   updated_sources+=("$src_submodule")
                 fi
                 cd -
@@ -91,7 +97,7 @@ jobs:
           if [ ${#updated[@]} -gt 0 -o ${#missing_sources[@]} -gt 0 -o ${#updated_sources[@]} -gt 0 ]; then
             echo "updated=true" >> "$GITHUB_OUTPUT"
             printf '%s\n' "${updated[@]}" > /tmp/updated-submodules.txt
-            printf '%s\n' "${missing_sources[@]}" > /tmp/missing_sources.txt
+            printf '%s\n' "${missing_sources[@]}" > /tmp/missing-sources.txt
             printf '%s\n' "${updated_sources[@]}" > /tmp/updated-sources.txt
           else
             echo "No submodules needed updating."
@@ -101,8 +107,7 @@ jobs:
       - name: Regenerate drivers/README.md
         if: steps.update.outputs.updated == 'true'
         run: |
-          sudo apt-get install -y rpm
-          scripts/update-drivers-list.sh
+          ./scripts/update-drivers-list.sh
 
       - name: Commit and open PR
         if: steps.update.outputs.updated == 'true'
@@ -115,8 +120,8 @@ jobs:
           git config user.email "gitimporter@vates.tech"
 
           git checkout -b "$branch"
-          git add drivers/8.3
-          git commit -m "drivers: update submodules and corresponding sources to latest 8.3 branch"
+          git add -u
+          git commit -s -m "drivers: update submodules and corresponding sources to latest 8.3 branch"
 
           # Force-push so a re-run on the same day updates the existing branch.
           git push --force origin "$branch"
@@ -126,12 +131,21 @@ jobs:
             {
               echo "Automated daily update of driver submodules to the latest \`8.3\` branch."
               echo ""
-              echo "Updated submodules:"
-              sed 's/^/- /' /tmp/updated-submodules.txt
-              echo "Added source submodules:"
-              sed 's/^/- /' /tmp/missing-sources.txt
-              echo "Updated source submodules:"
-              sed 's/^/- /' /tmp/updated-sources.txt
+              test -f /tmp/updated-submodules.txt && {
+                echo "Updated submodules:"
+                sed 's/^/- /' /tmp/updated-submodules.txt
+                echo ""
+              }
+              test -f /tmp/missing-sources.txt && {
+                echo "Added source submodules:"
+                sed 's/^/- /' /tmp/missing-sources.txt
+                echo ""
+              }
+              test -f /tmp/updated-sources.txt && {
+                echo "Updated source submodules:"
+                sed 's/^/- /' /tmp/updated-sources.txt
+                echo ""
+              }
             } > /tmp/pr-body.txt
 
             gh pr create \

.gitmodules

@@ -72,76 +72,76 @@
 	url = git@github.com:xcp-ng-rpms/r8125-module.git
 [submodule "drivers/8.3/source/aqc111u-module"]
 	path = drivers/8.3/source/aqc111u-module
-	url = git@github.com:xcp-ng-rpms/aqc111u-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/avago-megaraid-sas"]
 	path = drivers/8.3/source/avago-megaraid-sas
-	url = git@github.com:xcp-ng-rpms/avago-megaraid-sas.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/avago-mpt3sas"]
 	path = drivers/8.3/source/avago-mpt3sas
-	url = git@github.com:xcp-ng-rpms/avago-mpt3sas.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/broadcom-bnxt-en"]
 	path = drivers/8.3/source/broadcom-bnxt-en
-	url = git@github.com:xcp-ng-rpms/broadcom-bnxt-en.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/chelsio-cxgb4"]
 	path = drivers/8.3/source/chelsio-cxgb4
-	url = git@github.com:xcp-ng-rpms/chelsio-cxgb4.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-enic"]
 	path = drivers/8.3/source/cisco-enic
-	url = git@github.com:xcp-ng-rpms/cisco-enic.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-fnic"]
 	path = drivers/8.3/source/cisco-fnic
-	url = git@github.com:xcp-ng-rpms/cisco-fnic.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/dell-rbu-module"]
 	path = drivers/8.3/source/dell-rbu-module
-	url = git@github.com:xcp-ng-rpms/dell-rbu-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/emulex-lpfc"]
 	path = drivers/8.3/source/emulex-lpfc
-	url = git@github.com:xcp-ng-rpms/emulex-lpfc.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-e1000e"]
 	path = drivers/8.3/source/intel-e1000e
-	url = git@github.com:xcp-ng-rpms/intel-e1000e.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-fm10k"]
 	path = drivers/8.3/source/intel-fm10k
-	url = git@github.com:xcp-ng-rpms/intel-fm10k.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-i40e"]
 	path = drivers/8.3/source/intel-i40e
-	url = git@github.com:xcp-ng-rpms/intel-i40e.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ice"]
 	path = drivers/8.3/source/intel-ice
-	url = git@github.com:xcp-ng-rpms/intel-ice.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igb"]
 	path = drivers/8.3/source/intel-igb
-	url = git@github.com:xcp-ng-rpms/intel-igb.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igc"]
 	path = drivers/8.3/source/intel-igc
-	url = git@github.com:xcp-ng-rpms/intel-igc.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ixgbe"]
 	path = drivers/8.3/source/intel-ixgbe
-	url = git@github.com:xcp-ng-rpms/intel-ixgbe.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mellanox-mlnxen"]
 	path = drivers/8.3/source/mellanox-mlnxen
-	url = git@github.com:xcp-ng-rpms/mellanox-mlnxen.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-aacraid"]
 	path = drivers/8.3/source/microsemi-aacraid
-	url = git@github.com:xcp-ng-rpms/microsemi-aacraid.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-smartpqi"]
 	path = drivers/8.3/source/microsemi-smartpqi
-	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mpi3mr-module"]
 	path = drivers/8.3/source/mpi3mr-module
-	url = git@github.com:xcp-ng-rpms/mpi3mr-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-fastlinq"]
 	path = drivers/8.3/source/qlogic-fastlinq
-	url = git@github.com:xcp-ng-rpms/qlogic-fastlinq.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-netxtreme2"]
 	path = drivers/8.3/source/qlogic-netxtreme2
-	url = git@github.com:xcp-ng-rpms/qlogic-netxtreme2.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-qla2xxx"]
 	path = drivers/8.3/source/qlogic-qla2xxx
-	url = git@github.com:xcp-ng-rpms/qlogic-qla2xxx.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/r8125-module"]
 	path = drivers/8.3/source/r8125-module
-	url = git@github.com:xcp-ng-rpms/r8125-module.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/sfc-module-alt"]
 	path = drivers/8.3/srpm/sfc-module-alt
 	url = git@github.com:xcp-ng-rpms/sfc-module-alt.git
@@ -204,64 +204,64 @@
 	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi-alt.git
 [submodule "drivers/8.3/source/atlantic-module-alt"]
 	path = drivers/8.3/source/atlantic-module-alt
-	url = git@github.com:xcp-ng-rpms/atlantic-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/broadcom-bnxt-en-alt"]
 	path = drivers/8.3/source/broadcom-bnxt-en-alt
-	url = git@github.com:xcp-ng-rpms/broadcom-bnxt-en-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-enic-alt"]
 	path = drivers/8.3/source/cisco-enic-alt
-	url = git@github.com:xcp-ng-rpms/cisco-enic-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/cisco-fnic-alt"]
 	path = drivers/8.3/source/cisco-fnic-alt
-	url = git@github.com:xcp-ng-rpms/cisco-fnic-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/coretemp-module-alt"]
 	path = drivers/8.3/source/coretemp-module-alt
-	url = git@github.com:xcp-ng-rpms/coretemp-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/emulex-lpfc-alt"]
 	path = drivers/8.3/source/emulex-lpfc-alt
-	url = git@github.com:xcp-ng-rpms/emulex-lpfc-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-e1000e-alt"]
 	path = drivers/8.3/source/intel-e1000e-alt
-	url = git@github.com:xcp-ng-rpms/intel-e1000e-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-i40e-alt"]
 	path = drivers/8.3/source/intel-i40e-alt
-	url = git@github.com:xcp-ng-rpms/intel-i40e-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ice-alt"]
 	path = drivers/8.3/source/intel-ice-alt
-	url = git@github.com:xcp-ng-rpms/intel-ice-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-igb-alt"]
 	path = drivers/8.3/source/intel-igb-alt
-	url = git@github.com:xcp-ng-rpms/intel-igb-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/intel-ixgbe-alt"]
 	path = drivers/8.3/source/intel-ixgbe-alt
-	url = git@github.com:xcp-ng-rpms/intel-ixgbe-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mellanox-mlnxen-alt"]
 	path = drivers/8.3/source/mellanox-mlnxen-alt
-	url = git@github.com:xcp-ng-rpms/mellanox-mlnxen-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/microsemi-smartpqi-alt"]
 	path = drivers/8.3/source/microsemi-smartpqi-alt
-	url = git@github.com:xcp-ng-rpms/microsemi-smartpqi-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/mlx4-modules-alt"]
 	path = drivers/8.3/source/mlx4-modules-alt
-	url = git@github.com:xcp-ng-rpms/mlx4-modules-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-fastlinq-alt"]
 	path = drivers/8.3/source/qlogic-fastlinq-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-fastlinq-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-netxtreme2-alt"]
 	path = drivers/8.3/source/qlogic-netxtreme2-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-netxtreme2-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/qlogic-qla2xxx-alt"]
 	path = drivers/8.3/source/qlogic-qla2xxx-alt
-	url = git@github.com:xcp-ng-rpms/qlogic-qla2xxx-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/r8169-module-alt"]
 	path = drivers/8.3/source/r8169-module-alt
-	url = git@github.com:xcp-ng-rpms/r8169-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/sfc-module-alt"]
 	path = drivers/8.3/source/sfc-module-alt
-	url = git@github.com:xcp-ng-rpms/sfc-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "drivers/8.3/source/tg3-module-alt"]
 	path = drivers/8.3/source/tg3-module-alt
-	url = git@github.com:xcp-ng-rpms/tg3-module-alt.git
+	url = git@github.com:xcp-ng/driver-sources.git
 [submodule "driver-disks"]
 	path = driver-disks
 	url = git@github.com:xcp-ng/driver-disks.git