Redo unintentionally undone chip-cert-bins changes (project-chip#34481)

* Add data model XML files to chip-cert-bins * Add RVC app to chip-cert-bins image --------- Co-authored-by: Andrei Litvin <[email protected]>
austina-csa · Aug 12, 2024 · 95abd8d · 95abd8d
1 parent 4d2e742
commit 95abd8d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -192,6 +192,7 @@ RUN case ${TARGETPLATFORM} in \
     --target linux-x64-lit-icd-ipv6only \
     --target linux-x64-energy-management-ipv6only \
     --target linux-x64-microwave-oven-ipv6only \
+    --target linux-x64-rvc-ipv6only \
     build \
     && mv out/linux-x64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
     && mv out/linux-x64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
@@ -211,6 +212,7 @@ RUN case ${TARGETPLATFORM} in \
     && mv out/linux-x64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
     && mv out/linux-x64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
     && mv out/linux-x64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
+    && mv out/linux-x64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
     ;; \
     "linux/arm64")\
     set -x \
@@ -234,6 +236,7 @@ RUN case ${TARGETPLATFORM} in \
     --target linux-arm64-lit-icd-ipv6only \
     --target linux-arm64-energy-management-ipv6only \
     --target linux-arm64-microwave-oven-ipv6only \
+    --target linux-arm64-rvc-ipv6only \
     build \
     && mv out/linux-arm64-chip-tool-ipv6only-platform-mdns/chip-tool out/chip-tool \
     && mv out/linux-arm64-shell-ipv6only-platform-mdns/chip-shell out/chip-shell \
@@ -253,6 +256,7 @@ RUN case ${TARGETPLATFORM} in \
     && mv out/linux-arm64-lit-icd-ipv6only/lit-icd-app out/lit-icd-app \
     && mv out/linux-arm64-energy-management-ipv6only/chip-energy-management-app out/chip-energy-management-app \
     && mv out/linux-arm64-microwave-oven-ipv6only/chip-microwave-oven-app out/chip-microwave-oven-app \
+    && mv out/linux-arm64-rvc-ipv6only/chip-rvc-app out/chip-rvc-app \
     ;; \
     *) ;; \
     esac
@@ -285,11 +289,13 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-app1 chip-app1
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/lit-icd-app lit-icd-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-energy-management-app chip-energy-management-app
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-microwave-oven-app chip-microwave-oven-app
+COPY --from=chip-build-cert-bins /root/connectedhomeip/out/chip-rvc-app chip-rvc-app
 
 # Stage 3.1: Setup the Matter Python environment
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_lib python_lib
 COPY --from=chip-build-cert-bins /root/connectedhomeip/out/python_env python_env
-COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing
+COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing python_testing/scripts/sdk
+COPY --from=chip-build-cert-bins /root/connectedhomeip/data_model python_testing/data_model
 
 COPY --from=chip-build-cert-bins /root/connectedhomeip/scripts/tests/requirements.txt /tmp/requirements.txt
 RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt