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"