build-test-recipe.yml: use bitbake-setup

Author: thomas-roos

.github/workflows/build-test-recipe.yml

@@ -91,21 +91,45 @@ jobs:
           - qemuarm
           - qemuarm64
           - qemux86-64
+          - qemuriscv64
     runs-on: codebuild-${{ vars.CODEBUILD_RUNNER_NAME || 'meta-aws' }}-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Checkout meta-aws
         uses: actions/checkout@v4
         with:
             path: ${{ github.workspace }}/meta-aws
-      - name: Checkout meta-oe
-        uses: actions/checkout@v4
-        with:
-          repository: openembedded/meta-openembedded
-          path: ${{ github.workspace }}/meta-openembedded
-          ref: ${{ needs.changed.outputs.release }}
-      - name: Checkout poky
+      - name: Checkout BitBake
+        run: git clone https://git.openembedded.org/bitbake -b ${{ needs.changed.outputs.release }} ${{ github.workspace }}/bitbake
+      - name: Setup Source Override
+        run: |
+          cd meta-aws
+          META_AWS_REV=$(git rev-parse HEAD)
+          cd ..
+          cat > meta-aws-override.json << EOF
+          {
+            "sources": {
+              "meta-aws": {
+                "git-remote": {
+                  "remotes": {
+                    "origin": {
+                      "uri": "file://${{ github.workspace }}/meta-aws"
+                    }
+                  },
+                  "branch": "${{ needs.changed.outputs.release }}",
+                  "rev": "${META_AWS_REV}"
+                },
+                "path": "meta-aws"
+              }
+            },
+            "version": "1.0"
+          }
+          EOF
+      - name: Initialize Build Environment
         run: |
-          git clone git://git.yoctoproject.org/poky --single-branch  ${{ github.workspace }}/poky -b ${{ needs.changed.outputs.release }}
+          bitbake/bin/bitbake-setup init --non-interactive \
+            --source-overrides meta-aws-override.json \
+            ${{ github.workspace }}/meta-aws/.github/workflows/poky-with-meta-aws.conf.json \
+            poky distro/poky machine/${{ matrix.machine }}
       - name: Get changed Recipes or defaults
         id: recipes_to_build_test
         shell: bash
@@ -159,7 +183,7 @@ jobs:
            sysctl vm.mmap_min_addr=65536
            sudo RECIPES="$RECIPES" -u yoctouser bash -c '
              cd  ${{ github.workspace }}
-             source poky/oe-init-build-env build
+             source /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/init-build-env
              echo QEMU_USE_KVM = \"\" >> conf/local.conf
              # set to max for arm32
              echo QB_MEM:arm = \"-m 3G\" >> conf/local.conf
@@ -176,40 +200,35 @@ jobs:
              # this will allow - running testimage cmd: bitbake core-image-minimal -c testimage
              echo IMAGE_CLASSES += \"testimage\" >> conf/local.conf
              cat conf/local.conf
-             bitbake-layers add-layer ../meta-openembedded/meta-oe
-             bitbake-layers add-layer ../meta-openembedded/meta-python
-             bitbake-layers add-layer ../meta-openembedded/meta-networking
-             bitbake-layers add-layer ../meta-openembedded/meta-multimedia
-             bitbake-layers add-layer ../meta-aws
              export SSTATE_DIR=/sstate-cache
              export DL_DIR=/downloads
              export MACHINE=${{ matrix.machine }}
              export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS SSTATE_DIR DL_DIR"
              bitbake $RECIPES -f -k | tee -a $MACHINE-build.log'
            set -e
            echo RECIPES to build: $RECIPES
-           if [ -e "build/${{ matrix.machine }}-build.log" ]; then
-            if grep -A3 -E ' failed| ERROR:' "build/${{ matrix.machine }}-build.log"; then
+           if [ -e "/home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-build.log" ]; then
+            if grep -A3 -E ' failed| ERROR:' "/home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-build.log"; then
               echo "Found failed or ERROR in build log"
               exit 1
             fi
            else
-            echo "Build log file not found: build/${{ matrix.machine }}-build.log"
+            echo "Build log file not found: /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-build.log"
             exit 1
            fi
       - name: Save ${{ matrix.machine }}-build.log
         if: '!cancelled()'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.machine }}-build.log
-          path: build/${{ matrix.machine }}-build.log
+          path: /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-build.log
       - name: Run test
         env:
           RECIPES: ${{ steps.recipes_to_build_test.outputs.recipes }}
         run: |
            sudo RECIPES="$RECIPES" -u yoctouser bash -c '
              cd  ${{ github.workspace }}
-             source poky/oe-init-build-env build
+             source /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/init-build-env
              # PUT = package under test
              for recipe in $RECIPES; do PUT+="${recipe}-ptest "; done
              echo IMAGE_INSTALL:append = \" ptest-runner ssh ${PUT}\" >> conf/local.conf
@@ -222,11 +241,11 @@ jobs:
              resulttool report tmp/log/oeqa/testresults.json | tee -a ${{ matrix.machine }}-resulttool_report.txt'
             set -e
             echo RECIPES to test: $RECIPES
-            test -e build/tmp/log/oeqa/testresults.json && ! grep -B3 "\"FAILED\""  build/tmp/log/oeqa/testresults.json
+            test -e /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/tmp/log/oeqa/testresults.json && ! grep -B3 "\"FAILED\""  /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/tmp/log/oeqa/testresults.json
 
       - name: Save resulttool_report.txt
         if: '!cancelled()'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.machine }}-resulttool_report.txt
-          path: build/${{ matrix.machine }}-resulttool_report.txt
+          path: /home/runner/bitbake-builds/poky-with-meta-aws-poky-distro_poky-machine_${{ matrix.machine }}/build/${{ matrix.machine }}-resulttool_report.txt

.github/workflows/poky-with-meta-aws.conf.json

@@ -69,7 +69,7 @@
             "oe-fragments-one-of": {
                 "machine": {
                     "description": "Target machines",
-                    "options" : ["machine/qemux86-64", "machine/qemuarm64", "machine/qemuriscv64", "machine/genericarm64", "machine/genericx86-64"]
+                    "options" : ["machine/qemuarm", "machine/qemuarm64", "machine/qemux86-64", "machine/qemuriscv64", "machine/genericarm64", "machine/genericx86-64"]
                 },
                 "distro": {
                     "description": "Distribution configuration variants",