Merge pull request #74 from basak-qcom/fix-password-change-required

Fix password change required

Author: lool

.github/workflows/build-daily.yml

@@ -9,10 +9,10 @@ on:
 
 # implicitely set all other permissions to none
 permissions:
-  checks: write # test.yml
-  contents: read # debos.yml test.yml
-  packages: read # test.yml
-  pull-requests: write # test.yml
+  checks: write # lava-test.yml
+  contents: read # debos.yml lava-test.yml
+  packages: read # lava-test.yml
+  pull-requests: write # lava-test.yml
 
 jobs:
   build-daily:
@@ -23,7 +23,7 @@ jobs:
   test-daily:
     # don't run cron from forks of the main repository or from other branches
     if: github.repository == 'qualcomm-linux/qcom-deb-images' && github.ref == 'refs/heads/main'
-    uses: ./.github/workflows/test.yml
+    uses: ./.github/workflows/lava-test.yml
     needs: build-daily
     secrets: inherit
     with:

.github/workflows/build-on-pr.yml

@@ -5,10 +5,10 @@ on:
 
 # implicitely set all other permissions to none
 permissions:
-  checks: write # test.yml
-  contents: read # debos.yml lava-schema-check.yml test.yml
-  packages: read # test.yml
-  pull-requests: write # test.yml
+  checks: write # lava-test.yml
+  contents: read # debos.yml lava-schema-check.yml lava-test.yml
+  packages: read # lava-test.yml
+  pull-requests: write # lava-test.yml
 
 jobs:
   event-file:

.github/workflows/build-on-push.yml

@@ -6,18 +6,18 @@ on:
 
 # implicitely set all other permissions to none
 permissions:
-  checks: write # test.yml
-  contents: read # debos.yml lava-schema-check.yml test.yml
-  packages: read # test.yml
-  pull-requests: write # test.yml
+  checks: write # lava-test.yml
+  contents: read # debos.yml lava-schema-check.yml lava-test.yml
+  packages: read # lava-test.yml
+  pull-requests: write # lava-test.yml
 
 jobs:
   build-daily:
     uses: ./.github/workflows/debos.yml
   schema-check:
     uses: ./.github/workflows/lava-schema-check.yml
   test:
-    uses: ./.github/workflows/test.yml
+    uses: ./.github/workflows/lava-test.yml
     needs: [build-daily, schema-check]
     secrets: inherit
     with:

.github/workflows/debos.yml

@@ -61,8 +61,8 @@ jobs:
         run: cp -av "/fileserver-downloads/qcom-deb-images/u-boot-rb1-latest/rb1-boot.img" .
 
       # mtools is needed for the flash recipe
-      - name: Install debos and dependencies of the recipes
-        run: apt -y install debos mtools
+      - name: Install debos and dependencies of the recipes and local tests
+        run: apt -y install debos make mtools python3-pexpect python3-pytest qemu-efi-aarch64 qemu-system-arm
 
       - name: Setup local APT repo
         run: |
@@ -210,3 +210,12 @@ jobs:
         with:
           name: build_url
           path: build_url
+      - name: Invoke test runner
+        run: |
+           # This is currently a clone of Makefile's "test" target to avoid any
+           # unexpected interactions with triggering depending build targets.
+           # The plan is to move this entire workflow to use make targets
+           # instead but all at once. See #74 and #159.
+
+           # rootfs/ is a build artifact, so should not be scanned for tests
+           py.test-3 --ignore=rootfs

.github/workflows/test.yml renamed to .github/workflows/lava-test.yml

@@ -10,10 +10,10 @@ on:
 
 # implicitely set all other permissions to none
 permissions:
-  checks: write # test.yml EnricoMi/publish-unit-test-result-action
-  contents: read # test.yml actions/checkout
-  packages: read # test.yml actions/download-artifact
-  # test.yml EnricoMi/publish-unit-test-result-action
+  checks: write # lava-test.yml EnricoMi/publish-unit-test-result-action
+  contents: read # lava-test.yml actions/checkout
+  packages: read # lava-test.yml actions/download-artifact
+  # lava-test.yml EnricoMi/publish-unit-test-result-action
   # thollander/actions-comment-pull-request
   pull-requests: write
 
@@ -59,7 +59,7 @@ jobs:
           echo "url=${BUILD_URL}" >> $GITHUB_OUTPUT
 
   test:
-    uses: ./.github/workflows/test.yml
+    uses: ./.github/workflows/lava-test.yml
     secrets: inherit
     needs: retrieve-build-url
     with:

.github/workflows/test-pr.yml

@@ -17,10 +17,14 @@ all: disk-ufs.img.gz disk-sdcard.img.gz
 rootfs.tar.gz: debos-recipes/qualcomm-linux-debian-rootfs.yaml
 	$(DEBOS) $<
 
-disk-ufs.img.gz: debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar.gz
+disk-ufs.img disk-ufs.img.gz: debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar.gz
 	$(DEBOS) $<
 
 disk-sdcard.img.gz: debos-recipes/qualcomm-linux-debian-image.yaml rootfs.tar.gz
 	$(DEBOS) -t imagetype:sdcard $<
 
-.PHONY: all
+test: disk-ufs.img
+	# rootfs/ is a build artifact, so should not be scanned for tests
+	py.test-3 --ignore=rootfs
+
+.PHONY: all test

Makefile

@@ -182,6 +182,76 @@ NB: It's also possible to run qdl from the host while the baord is not connected
 
 Want to join in the development? Changes welcome! See [CONTRIBUTING.md file](CONTRIBUTING.md) for step by step instructions.
 
+### Test an image locally with qemu
+
+You can boot an image locally with qemu as follows:
+
+1. Install dependencies. `qemu-system-arm` is required together with
+an aarch64 build of UEFI. On Debian and Ubuntu, this is provided by the
+`qemu-system-arm` package which recommends `qemu-efi-aarch64`:
+    ```bash
+    sudo apt install qemu-system-arm qemu-efi-aarch64
+    ```
+
+1. As above under "Usage", build the disk image from the root filesystem
+   tarball if you haven't done this already:
+    ```bash
+    debos debos-recipes/qualcomm-linux-debian-image.yaml
+    ```
+
+1. Run qemu as follows:
+    ```bash
+    # SCSI is required to present a device with a matching 4096 sector size
+    # inside the VM
+    qemu-system-aarch64 -cpu cortex-a57 -m 2048 -M virt -nographic \
+        -device virtio-scsi-pci,id=scsi1 \
+        -device scsi-hd,bus=scsi1.0,drive=disk1,physical_block_size=4096,logical_block_size=4096 \
+        -drive if=none,file=disk-ufs.img,format=raw,id=disk1 \
+        -bios /usr/share/AAVMF/AAVMF_CODE.fd
+    ```
+
+#### Copy on write
+
+Instead of modifying `file-ufs.img`, you can arrange copy-on-write, for example
+to reproduce the same first boot multiple times:
+
+1. Prepare a qcow file to contain the writes, backed by `disk-ufs.img`:
+    ```bash
+    qemu-img create -b disk-ufs.img -f qcow -F raw disk1.qcow
+    ```
+
+1. Run qemu as follows:
+    ```bash
+    qemu-system-aarch64 -cpu cortex-a57 -m 2048 -M virt -nographic \
+        -device virtio-scsi-pci,id=scsi1 \
+        -device scsi-hd,bus=scsi1.0,drive=disk1,physical_block_size=4096,logical_block_size=4096 \
+        -drive if=none,file=disk1.img,format=qcow,id=disk1 \
+        -bios /usr/share/AAVMF/AAVMF_CODE.fd
+    ```
+
+#### Direct kernel boot
+
+For debugging purposes, it is sometimes useful to boot the kernel directly, for
+example to confirm that an issue in the image lies in the bootloader
+installation. You can do this as follows:
+
+1. Extract the rootfs:
+    ```bash
+    mkdir rootfs
+    tar xzC rootfs -f rootfs.tar.gz
+    ```
+
+2. Run qemu against the kernel and initrd present inside the rootfs directly:
+    ```bash
+    qemu-system-aarch64 -cpu cortex-a57 -m 2048 -M virt -nographic \
+        -device virtio-scsi-pci,id=scsi1 \
+        -device scsi-hd,bus=scsi1.0,drive=disk1,physical_block_size=4096,logical_block_size=4096 \
+        -drive if=none,file=disk-ufs.img,format=raw,id=disk1 \
+        -kernel rootfs/boot/vmlinuz-*
+        -initrd rootfs/boot/initrd.img-*
+        -append root=/dev/sda2
+    ```
+
 ## Reporting Issues
 
 We'd love to hear if you run into issues or have ideas for improvements. [Report an Issue on GitHub](../../issues) to discuss, and try to include as much information as possible on your specific environment.

README.md

@@ -37,11 +37,17 @@ actions:
       password_prompt: 'Password'
       password: debian
       login_commands:
+      - "debian"
+      - "new password"
+      - "new password"
       - sudo su
     method: minimal
     prompts:
     - root@debian
     - debian@debian
+    - "Current password"
+    - "New password"
+    - "Retype new password"
     timeout:
       minutes: 3
 - test:

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

@@ -38,11 +38,17 @@ actions:
       password_prompt: 'Password'
       password: debian
       login_commands:
+      - "debian"
+      - "new password"
+      - "new password"
       - sudo su
     method: minimal
     prompts:
     - root@debian
     - debian@debian
+    - "Current password"
+    - "New password"
+    - "Retype new password"
     timeout:
       minutes: 3
 - test: