Skip to content

Commit f55ca6c

Browse files
committed
WIP: Always use debos from trixie
1 parent 2e28520 commit f55ca6c

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/debos.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
url: ${{ steps.upload_artifacts_s3.outputs.url }}
5959
runs-on: [self-hosted, qcom-u2404, arm64]
6060
container:
61-
image: public.ecr.aws/${{ inputs.distro }}/${{ inputs.distro }}:${{ inputs.suite }}
61+
image: public.ecr.aws/debian/debian:trixie
6262
volumes:
6363
- /efs/qli/metaqcom/gh-runners/quic-yocto/downloads:/fileserver-downloads
6464
options: --privileged
@@ -80,14 +80,11 @@ jobs:
8080
run: cp -av "/fileserver-downloads/qcom-deb-images/u-boot-rb1-latest/rb1-boot.img" .
8181

8282
# mtools is needed for the flash recipe
83+
# mmdebstrap bootstraps rootfs for the target distro/suite from a
84+
# Debian trixie build environment; debos is not installable on Ubuntu
85+
# noble and doesn't work on forky or resolute
8386
- name: Install debos and dependencies of the recipes and local tests
84-
run: |
85-
set -ux
86-
keyring=debian-archive-keyring
87-
if [ "${{ inputs.distro }}" = "ubuntu" ]; then
88-
keyring=ubuntu-keyring
89-
fi
90-
apt -y install "$keyring" debos make mmdebstrap mtools python3-pexpect python3-pytest qemu-efi-aarch64 qemu-system-arm
87+
run: apt -y install debian-archive-keyring debos make mmdebstrap mtools python3-pexpect python3-pytest qemu-efi-aarch64 qemu-system-arm
9188

9289
- name: Setup local APT repo
9390
run: |

0 commit comments

Comments
 (0)