Github workflow: build both Poky and Qcom DISTRO configs (#935)

Add another axis to the CI matrix: distro.name and have a companion
variable to add optional extra yaml files. The DISTRO in
meta-qcom-distro needs `distro.yml`, while the default
Poky-that-isn't-poky-anymore does not need an extra yaml.

Author: ndechesne

.github/workflows/build-yocto.yml

@@ -96,8 +96,13 @@ jobs:
           - qrb2210-rb1-core-kit
           - qcom-armv8a
           - qcom-armv7a
+        distro:
+          - name: poky-altcfg
+            yamlfile: ""
+          - name: qcom
+            yamlfile: 'ci/distro.yml:'
     runs-on: [self-hosted, x86]
-    name: ${{ matrix.machine }}/poky-altcfg
+    name: ${{ matrix.machine }}/${{ matrix.distro.name }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -116,7 +121,7 @@ jobs:
           mkdir $KAS_WORK_DIR
           ${KAS_CONTAINER} dump --resolve-env --resolve-local --resolve-refs \
               ci/mirror.yml:ci/${{ matrix.machine }}.yml > kas-build.yml
-          ${KAS_CONTAINER} build ci/mirror.yml:ci/${{ matrix.machine }}.yml
+          ${KAS_CONTAINER} build ci/mirror.yml:${{ matrix.distro.yamlfile }}ci/${{ matrix.machine }}.yml
           ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
           mv $KAS_WORK_DIR/build/buildchart.svg .
 
@@ -126,12 +131,12 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: buildchart-${{ matrix.machine }}
+          name: buildchart-${{ matrix.distro.name }}-${{ matrix.machine }}
           path: buildchart.svg
 
       - uses: actions/upload-artifact@v4
         with:
-          name: kas-build-${{ matrix.machine }}
+          name: kas-build-${{ matrix.distro.name }}-${{ matrix.machine }}
           path: kas-build.yml
 
       - name: Stage build artifacts for publishing
@@ -140,8 +145,8 @@ jobs:
           # expects file to be relative to our PWD. deploy_dir is outside
           # that, so we move things around:
           deploy_dir=../kas/build/tmp/deploy/images/${{matrix.machine}}
-          uploads_dir=./uploads
-          mkdir $uploads_dir
+          uploads_dir=./uploads/${{ matrix.distro.name }}
+          mkdir -p $uploads_dir
           find $deploy_dir/ -maxdepth 1 -name "*.rootfs*.qcomflash" -exec rm -rf {} \;
           cp buildchart.svg kas-build.yml $deploy_dir/
           mv $deploy_dir $uploads_dir/

ci/lava/dragonboard-410c/boot.yaml

@@ -7,11 +7,11 @@ actions:
       boot:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/qcom-armv8a/boot-apq8016-sbc-qcom-armv8a.img"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/qcom-armv8a/boot-apq8016-sbc-qcom-armv8a.img"
       rootfs:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
         compression: gz
     postprocess:
       docker:

ci/lava/dragonboard-820c/boot.yaml

@@ -7,11 +7,11 @@ actions:
       boot:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/qcom-armv8a/boot-apq8096-db820c-qcom-armv8a.img"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/qcom-armv8a/boot-apq8096-db820c-qcom-armv8a.img"
       rootfs:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/qcom-armv8a/core-image-base-qcom-armv8a.rootfs.ext4.gz"
         compression: gz
     postprocess:
       docker:

ci/lava/qcs6490-rb3gen2-core-kit/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main

ci/lava/qcs9075-iq-9075-evk/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main

ci/lava/qcs9100-ride-sx/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main

ci/lava/qrb2210-rb1-core-kit/boot.yaml

@@ -4,7 +4,7 @@ actions:
       image:
         headers:
           Authentication: Q_GITHUB_TOKEN
-        url: "{{BUILD_DOWNLOAD_URL}}/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
+        url: "{{BUILD_DOWNLOAD_URL}}/poky-altcfg/{{DEVICE_TYPE}}/core-image-base-{{DEVICE_TYPE}}.rootfs.qcomflash.tar.gz"
     postprocess:
       docker:
         image: ghcr.io/foundriesio/lava-lmp-sign:main