Merge branch 'qualcomm-linux:master' into master

Author: jpagadal

.github/actions/compile/action.yml

@@ -39,24 +39,24 @@ runs:
       run: |
         mkdir $KAS_WORK_DIR
         ${{inputs.kas}} dump --resolve-env --resolve-local --resolve-refs \
-          ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }} > kas-build.yml
+          ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }} > kas-build.yml
 
     - name: Kas qcom world build
       shell: bash
       run: |
-        ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
+        ${{inputs.kas}} build ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/world.yml
         ci/kas-container-shell-helper.sh ci/yocto-pybootchartgui.sh
         mv $KAS_WORK_DIR/build/buildchart.svg buildchart-world.svg
 
     - name: Kas build images
       shell: bash
       run: |
-        ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}
+        ${{inputs.kas}} build 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 .
 
         if [ "${{ inputs.machine }}" = "qcom-armv8a" ]; then
-          ${{inputs.kas}} build ci/mirror.yml:ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
+          ${{inputs.kas}} build ci/${{ inputs.machine }}.yml${{ inputs.distro_yaml }}${{ inputs.kernel_yaml }}:ci/initramfs-test.yml
         fi
 
     - uses: actions/upload-artifact@v4
@@ -96,3 +96,23 @@ runs:
         path: ./uploads
         destination: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ github.run_id }}-${{ github.run_attempt }}/
         s3_bucket: qcom-prd-gh-artifacts
+
+    - name: "Print output"
+      shell: bash
+      id: print-output
+      run: |
+        KERNEL_DIRNAME="${{ inputs.kernel_dirname }}"
+        if [ -n "${KERNEL_DIRNAME}" ]; then
+            KERNEL_DIRNAME="_${KERNEL_DIRNAME}"
+        fi
+        BUILDNAME="${{ inputs.machine }}_${{ inputs.distro_name }}${KERNEL_DIRNAME}"
+        FILENAME="build-url_${BUILDNAME}"
+        echo "${{ steps.upload_artifacts.outputs.url }}" > "${FILENAME}"
+        echo "filename=${FILENAME}" >> $GITHUB_OUTPUT
+    - name: Upload build URL
+      uses: actions/upload-artifact@v4
+      with:
+        overwrite: true
+        name: ${{ steps.print-output.outputs.filename }}
+        path: ${{ steps.print-output.outputs.filename }}
+

.github/workflows/build-yocto.yml

@@ -165,24 +165,41 @@ jobs:
           cache_dir: ${CACHE_DIR}
           kas: ${KAS_CONTAINER}
 
-  create-output:
+  publish_summary:
     needs: compile
-    outputs:
-      url: ${{ steps.print-output.outputs.url }}
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, qcom-u2404, amd64-ssd]
     steps:
+      - name: 'Download build URLs'
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          pattern: build-url*
+
       - name: "Print output"
+        shell: bash
         id: print-output
-        env:
-          build_url: ${{ needs.compile.outputs.url }}
         run: |
-          echo "Downloads URL: ${build_url}"
-          echo "url=\"${build_url}\"" >> $GITHUB_OUTPUT
-          echo "${build_url}" > build_url
-          echo "## Download URL" >> $GITHUB_STEP_SUMMARY
-          echo "[${build_url}](${build_url})" >> $GITHUB_STEP_SUMMARY
+          echo "## Download URLs" >> $GITHUB_STEP_SUMMARY
+          export BUILD_URL=""
+          for FILE in build-url*
+          do
+              # Extract build OS and machine name
+              remainder="$FILE"
+              BUILD_URL_STR="${remainder%%_*}"; remainder="${remainder#*_}"
+              MACHINE="${remainder%%_*}"; remainder="${remainder#*_}"
+              OS="${remainder%%_*}"
+              BUILD_URL=$(cat "$FILE/$FILE")
+              echo "### ${MACHINE} ${OS}" >> $GITHUB_STEP_SUMMARY
+              echo "[${BUILD_URL}](${BUILD_URL})" >> $GITHUB_STEP_SUMMARY
+          done
+          # for backward compatibility only
+          # This section should be removed once the patch is merged
+          echo "${BUILD_URL}" > build_url
       - name: Upload build URL
         uses: actions/upload-artifact@v4
         with:
+          overwrite: true
           name: build_url
           path: build_url
+
+

.github/workflows/lava-schema-check.yml

@@ -20,4 +20,4 @@ jobs:
     needs: build-nightly
     secrets: inherit
     with:
-      url: ${{ needs.build-nightly.outputs.artifacts_url }}
+      build_id: ${{ github.run_id }}

.github/workflows/nightly-build.yml

@@ -21,6 +21,4 @@ jobs:
         path: ${{ github.event_path }}
   build-pr:
     uses: ./.github/workflows/build-yocto.yml
-  schema-check:
-    uses: ./.github/workflows/lava-schema-check.yml
 

.github/workflows/pr.yml

@@ -14,11 +14,9 @@ permissions:
 jobs:
   build:
     uses: ./.github/workflows/build-yocto.yml
-  schema-check:
-    uses: ./.github/workflows/lava-schema-check.yml
   test:
     uses: ./.github/workflows/test.yml
-    needs: [build, schema-check]
+    needs: [build]
     secrets: inherit
     with:
-      url: ${{ needs.build.outputs.artifacts_url }}
+      build_id: ${{ github.run_id }}

.github/workflows/push.yml

@@ -15,32 +15,12 @@ permissions:
   packages: read
 
 jobs:
-  retrieve-build-url:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    outputs:
-      url: ${{ steps.set-build-url.outputs.url }}
-    steps:
-      - name: 'Download build URL'
-        id: download-artifact
-        uses: actions/download-artifact@v4
-        with:
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          name: build_url
-      - name: 'Setup build URL'
-        id: set-build-url
-        run: |
-          BUILD_URL=$(cat build_url)
-          echo "Build URL: ${BUILD_URL}"
-          echo "url=${BUILD_URL}" >> $GITHUB_OUTPUT
-
   test:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/test.yml
     secrets: inherit
-    needs: retrieve-build-url
     with:
-      url: ${{ needs.retrieve-build-url.outputs.url }}
+      build_id: ${{ github.event.workflow_run.id }}
 
   publish-test-results:
     name: "Publish Tests Results"

.github/workflows/test-pr.yml

@@ -3,28 +3,79 @@ name: Tests
 on:
   workflow_call:
     inputs:
-      url:
+      build_id:
         required: true
         type: string
 
 jobs:
+  prepare-jobs:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        machine:
+          - iq-8275-evk
+          - iq-9075-evk
+          - qcm6490-idp
+          - qcs615-adp-air
+          - qcs6490-rb3gen2-core-kit
+          - qcs8300-ride-sx
+          - qcs9100-ride-sx
+          - qrb2210-rb1-core-kit
+          - qcom-armv8a
+          - qcom-armv7a
+        distro:
+          - name: poky-altcfg
+          - name: qcom-distro
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 'Download build URLs'
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ inputs.build_id }}
+          pattern: build-url*
+
+      - name: "Generate testjobs"
+        run: |
+          export BUILD_URL_FILE="$GITHUB_WORKSPACE/build-url_${{ matrix.machine }}_${{ matrix.distro.name }}/build-url_${{ matrix.machine }}_${{ matrix.distro.name }}"
+          echo "${BUILD_URL_FILE}"
+          if [ -f "$BUILD_URL_FILE" ]; then
+              # install dependencies
+              export BUILD_URL=$(cat "${BUILD_URL_FILE}")
+              pip install jinja2
+              if [ "${{ matrix.machine }}" = "qcom-armv8a" ]; then
+                  python3 ci/generatetests.py --templates ci/lava --os ${{ matrix.distro.name }} --device dragonboard-410c --build-url "${BUILD_URL}"
+                  python3 ci/generatetests.py --templates ci/lava --os ${{ matrix.distro.name }} --device dragonboard-820c --build-url "${BUILD_URL}"
+                  echo "MACHINE=dragonboard" >> $GITHUB_ENV
+              else
+                  python3 ci/generatetests.py --templates ci/lava --os ${{ matrix.distro.name }} --device ${{ matrix.machine }} --build-url "${BUILD_URL}"
+                  echo "MACHINE=${{ matrix.machine }}" >> $GITHUB_ENV
+              fi
+          fi
+      - name: 'Upload test jobs'
+        uses: actions/upload-artifact@v4
+        with:
+          name: testjobs-${{ matrix.machine }}-${{ matrix.distro.name }}
+          path: ${{ env.MACHINE}}*-${{ matrix.distro.name }}-*.yaml
+
   prepare-job-list:
+    needs: prepare-jobs
     runs-on: ubuntu-latest
     outputs:
       jobmatrix: ${{ steps.listjobs.outputs.jobmatrix }}
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
+      - name: 'Download job templates'
+        uses: actions/download-artifact@v4
         with:
-          fetch-depth: 0
-      - name: Print trigger
-        run: |
-          echo "Triggered by ${{ github.event_name }}"
-          echo "Build URL: ${{ inputs.url }}"
+          pattern: testjobs-*
+
       - name: "List jobs"
         id: listjobs
         run: |
-          JOBFILES=$(find ci/lava/ -name *.yaml)
+          JOBFILES=$(find . -name *.yaml)
           JOBFILES=$(echo "$JOBFILES" | sed -e "s/^/\"/" | sed -e "s/$/\",/" | tr -d "\n" | sed -e "s/.$//")
           JOBFILES="[${JOBFILES}]"
           J=$(jq -cn --argjson jobfiles "$JOBFILES" '{target: $jobfiles}')
@@ -35,34 +86,21 @@ jobs:
     needs: prepare-job-list
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix: ${{ fromJson(needs.prepare-job-list.outputs.jobmatrix) }}
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
+      - name: 'Download job templates'
+        uses: actions/download-artifact@v4
         with:
-          fetch-depth: 0
+          pattern: testjobs-*
 
-      - name: "Update test definition ${{ matrix.target }}"
+      - name: 'Prepare output file name'
         run: |
-          TARGET=${{ matrix.target }}
-          FIND_PATH="${TARGET#*/}"
-          DEVICE_TYPE_PATH="${FIND_PATH%/*}"
-          DEVICE_TYPE="${DEVICE_TYPE_PATH#*/}"
-          BUILD_DOWNLOAD_URL="${{inputs.url}}"
-          FILE_NAME=$(echo "${FIND_PATH%.yaml}" | tr "/" "-")
-          sed -i "s|{{DEVICE_TYPE}}|${DEVICE_TYPE}|g" "${{ matrix.target }}"
-          sed -i "s|{{GITHUB_SHA}}|${GITHUB_SHA}|g" "${{ matrix.target }}"
-          sed -i "s|{{BUILD_DOWNLOAD_URL}}|${BUILD_DOWNLOAD_URL}|g" "${{ matrix.target }}"
-          sed -i "s|{{GITHUB_RUN_ID}}|${GITHUB_RUN_ID}|g" "${{ matrix.target }}"
-          cat "${{ matrix.target }}"
-          echo "JOB_NAME=${FILE_NAME}" >> $GITHUB_ENV
+          OUTPUT_NAME=$(echo "${{ matrix.target }}" | sed "s|\/|-|g")
+          echo "RESULT_NAME=${OUTPUT_NAME#??}" >> $GITHUB_ENV
 
       - name: Submit ${{ matrix.target }}
         timeout-minutes: 20
         uses: foundriesio/lava-action@v8
-        env:
-          JOB_NAME: ${{ env.JOB_NAME }}
         with:
           lava_token: ${{ secrets.LAVATOKEN }}
           lava_url: 'lava.infra.foundries.io'
@@ -72,7 +110,7 @@ jobs:
           fail_action_on_incomplete: false
           save_result_as_artifact: true
           save_job_details: true
-          result_file_name: "${{ env.JOB_NAME }}"
+          result_file_name: "${{ env.RESULT_NAME }}"
 
   publish-test-results:
     name: "Publish Tests Results"
@@ -93,11 +131,6 @@ jobs:
           echo $GITHUB_WORKSPACE
           ls -R $GITHUB_WORKSPACE
 
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          files: "${{ github.workspace }}/artifacts/**/*.xml"
-
       - name: Publish Test Job Details
         run: |
           for json_file in $(find ${{ github.workspace }} -name "test-job-*.json")
@@ -108,3 +141,10 @@ jobs:
               echo " * [Job $JOB_ID on $DEVICE_TYPE]($URL)"
               echo " * [Job $JOB_ID on $DEVICE_TYPE]($URL)" >> $GITHUB_STEP_SUMMARY
           done
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: "${{ github.workspace }}/artifacts/**/*.xml"
+          action_fail: true
+          action_fail_on_inconclusive: true

.github/workflows/test.yml

@@ -30,7 +30,7 @@ repos:
 local_conf_header:
   base: |
     CONF_VERSION = "2"
-    INHERIT += "buildstats buildstats-summary"
+    INHERIT += "buildstats-summary"
     INHERIT += "buildhistory"
     INHERIT += "rm_work"
   cmdline: |