CI: reduce pressure on build infrastructure

CI is having stability issues, most likely caused by the huge number of
jobs trying to build and upload artifacts in parallel. Reduce the number
of jobs being by merging two qcom-distro jobs into a single one and
using special job for qcom-armv7a / qcom-distro builds.

Signed-off-by: Dmitry Baryshkov <[email protected]>

Author: lumag

.github/actions/compile/action.yml

@@ -14,6 +14,8 @@ inputs:
     required: true
   kas:
     required: true
+  target:
+    required: false
 outputs:
   url:
     description: Location of the published binaries
@@ -51,7 +53,7 @@ runs:
     - name: Kas build images
       shell: bash
       run: |
-        ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
+        env KAS_TARGET="${{inputs.target}}" ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
         ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
         mv $KAS_WORK_DIR/build/buildchart.svg .
 

.github/workflows/build-yocto.yml

@@ -76,8 +76,6 @@ jobs:
             yamlfile: ""
           - name: qcom-distro
             yamlfile: ':ci/qcom-distro.yml'
-          - name: qcom-distro-prop-image
-            yamlfile: ':ci/qcom-distro-prop-image.yml'
         kernel:
           - type: default
             dirname: ""
@@ -120,8 +118,6 @@ jobs:
             yamlfile: ""
           - name: qcom-distro
             yamlfile: ':ci/qcom-distro.yml'
-          - name: qcom-distro-prop-image
-            yamlfile: ':ci/qcom-distro-prop-image.yml'
         kernel:
           - type: default
             dirname: ""
@@ -144,11 +140,20 @@ jobs:
                 type: additional
                 dirname: "+linux-yocto-lts"
                 yamlfile: ":ci/linux-yocto-lts.yml"
+          - machine: qcom-armv7a
+            distro:
+                name: qcom-distro
+                yamlfile: ':ci/qcom-distro.yml'
+                target: qcom-multimedia-image
+            kernel:
+                type: default
+                dirname: ""
+                yamlfile: ""
         exclude:
           # Incompatible builds
           - machine: qcom-armv7a
             distro:
-                name: qcom-distro-prop-image
+                name: qcom-distro
     name: ${{ matrix.machine }}/${{ matrix.distro.name }}${{ matrix.kernel.dirname }}
     steps:
       - uses: actions/checkout@v4
@@ -164,6 +169,7 @@ jobs:
           kernel_dirname: ${{matrix.kernel.dirname}}
           cache_dir: ${CACHE_DIR}
           kas: ${KAS_CONTAINER}
+          target: ${{matrix.distro.target}}
 
   create-output:
     needs: compile

ci/qcom-distro-prop-image.yml

@@ -35,3 +35,4 @@ local_conf_header:
 
 target:
   - qcom-multimedia-image
+  - qcom-multimedia-proprietary-image