From f2f595d089969ff33117b7aedbaa4a3f6ea671c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 16 Feb 2023 21:44:38 +0100 Subject: [PATCH] ci: testbed: labgrid: use latest labgrid wip/testbed-next 2023-01-30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use latest labgrid with following fixes and additions: * modbus: allow exclusive management of a single coil * shelldriver: make run wrapper injecting more reliable * shelldriver: make kernel silencing more reliable * shelldriver: fix missing kernel silencing on passwordless consoles * shelldriver: make post_login_settle_time generally available * ubootdriver: allow handling of console output decoding errors * ubootdriver: use codec and decodeerrors args for decoding * smallubootdriver: use codec and decodeerrors args for decoding * ubootdriver: add possibility to delay boot_command execution * ubootdriver: add possibility to extend init commands timeout Mainly doing that in a hope, that it should hopefully improve DUT bringup at least for Turris Omnia and URX851 reference targets. Signed-off-by: Petr Štetiar --- .gitlab-ci.yml | 1 + .gitlab/docker/testbed/Dockerfile | 4 ++-- .testbed/labgrid/testbed-02.yaml | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64aaaf3efb..cbd1cc9dd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ include: - local: .gitlab/docker/testbed/gitlab.yml - local: .gitlab/docker/sdk/gitlab.yml - local: .gitlab/testbed.yml + - local: .gitlab/testbed/prpl-haze.yml - local: .gitlab/testbed/turris-omnia.yml stages: diff --git a/.gitlab/docker/testbed/Dockerfile b/.gitlab/docker/testbed/Dockerfile index 7bee9eb673..495c720670 100644 --- a/.gitlab/docker/testbed/Dockerfile +++ b/.gitlab/docker/testbed/Dockerfile @@ -29,8 +29,8 @@ RUN \ RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 ENV LANG=en_US.utf8 -ENV LABGRID_COMMIT=0e1ef80ca803 -RUN git clone --branch wip/testbed https://gitlab.com/prpl-foundation/prplOS/labgrid +ENV LABGRID_COMMIT=1ca30de33a1f57eb +RUN git clone --branch wip/testbed-next https://gitlab.com/prpl-foundation/prplOS/labgrid WORKDIR labgrid RUN git reset --hard $LABGRID_COMMIT diff --git a/.testbed/labgrid/testbed-02.yaml b/.testbed/labgrid/testbed-02.yaml index 283cf0ca55..abdfa0a5c2 100644 --- a/.testbed/labgrid/testbed-02.yaml +++ b/.testbed/labgrid/testbed-02.yaml @@ -5,6 +5,8 @@ targets: ModbusTCPCoil: host: quido.testbed-02.vpn.true.cz coil: 7 + managed_coils: 8 + exclusive_coil_mode: True write_multiple_coils: True RawSerialPort: port: "/dev/glinet-b1300" @@ -36,6 +38,8 @@ targets: ModbusTCPCoil: host: quido.testbed-02.vpn.true.cz coil: 7 + managed_coils: 8 + exclusive_coil_mode: True write_multiple_coils: True RawSerialPort: port: "/dev/glinet-b1300"