Ericwol/docker update (#2525)

* remove debian stretch * print PI version * move to OpenSSL_1_1_1v * docker update * remove curl --version * update global_valgrind_suppression.supp * update repos * debian buster update * enbale prov_valgrind_suppression * update suppression
2023-08-30 16:24:18 -07:00 · 2023-08-30 16:24:18 -07:00 · 95a41caa05
--- a/build/.vsts-ci.yml
+++ b/build/.vsts-ci.yml
@ -21,9 +21,9 @@ resources:
  - container: linux-c-ubuntu-c-ares
    endpoint: csdk-containers
    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-c-ares:latest
-  - container: linux-c-debian
+  - container: linux-c-debian-buster
    endpoint: csdk-containers
-    image: csdkcontainerregistry.azurecr.io/linux-c-debian:latest
+    image: csdkcontainerregistry.azurecr.io/linux-c-debian-buster:latest
  - container: linux-c-ubuntu-clang
    endpoint: csdk-containers
    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-clang:latest
@ -559,10 +559,10 @@ jobs:
      testRunTitle: 'ubuntu2204dualipstack'
    condition: succeededOrFailed()
 - job: debian
-  container: linux-c-debian
+  container: linux-c-debian-Buster
  pool: 
    name: 'sdk-c--ubuntu-22'
-  displayName: 'Debian'
+  displayName: 'Debian (Buster)'
  steps:
  - script: |
      sudo ./jenkins/debian_c.sh
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9e8599f960f8942f874f8dcacf7d4e6d88266296
+Subproject commit 0e120535898c4b00bb2ec6f3c4c7f59ee5e8ead8
--- a/deps/uhttp
+++ b/deps/uhttp
@ -1 +1 @@
-Subproject commit 54496f825a615b474834312318e71a90b833058c
+Subproject commit ac5d2341649008fa0d78c11e710fec9165e0adfd
--- a/iothub_client/tests/global_valgrind_suppression.supp
+++ b/iothub_client/tests/global_valgrind_suppression.supp
@ -678,3 +678,43 @@
   fun:start_thread
   fun:clone
 }
+{
+   <insert_a_suppression_name_here>
+   Helgrind:Misc
+   fun:mutex_destroy_WRK
+   obj:/usr/lib/x86_64-linux-gnu/libp11-kit.so.0.3.0
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   Helgrind:Misc
+   fun:mutex_destroy_WRK
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   drd:MutexErr
+   fun:pthread_mutex_destroy_intercept
+   fun:pthread_mutex_destroy
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   drd:MutexErr
+   fun:pthread_mutex_destroy_intercept
+   fun:pthread_mutex_destroy
+   obj:/usr/lib/x86_64-linux-gnu/libp11-kit.so.0.3.0
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
--- a/jenkins/raspberrypi_c_buster.sh
+++ b/jenkins/raspberrypi_c_buster.sh
@ -7,6 +7,11 @@ set -o errexit # Exit if command failed
 set -o nounset # Exit if variable not set
 set -o pipefail # Exit if pipe failed

+# Print version
+cat /etc/*release | grep VERSION*
+gcc --version
+openssl version
+
 # assume directory is root of downloaded repo
 mkdir cmake
 cd cmake
--- a/provisioning_client/deps/utpm
+++ b/provisioning_client/deps/utpm
@ -1 +1 @@
-Subproject commit 863e456aed269383b8b7ee2fa17b16dc320c05fd
+Subproject commit a5b53ae25c5735223ac41256acd1da1384d25744
--- a/provisioning_client/tests/common_prov_e2e/prov_valgrind_suppression.supp
+++ b/provisioning_client/tests/common_prov_e2e/prov_valgrind_suppression.supp
@ -371,4 +371,44 @@
  fun:TestSuiteInitialize
  fun:RunTests
  fun:main
-}
+}
+{
+   <insert_a_suppression_name_here>
+   Helgrind:Misc
+   fun:mutex_destroy_WRK
+   obj:/usr/lib/x86_64-linux-gnu/libp11-kit.so.0.3.0
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   Helgrind:Misc
+   fun:mutex_destroy_WRK
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   drd:MutexErr
+   fun:pthread_mutex_destroy_intercept
+   fun:pthread_mutex_destroy
+   obj:/usr/lib/x86_64-linux-gnu/libp11-kit.so.0.3.0
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
+{
+   <insert_a_suppression_name_here>
+   drd:MutexErr
+   fun:pthread_mutex_destroy_intercept
+   fun:pthread_mutex_destroy
+   fun:_dl_fini
+   fun:__run_exit_handlers
+   fun:exit
+   fun:(below main)
+}
--- a/provisioning_client/tests/hsm_client_key_ut/CMakeLists.txt
+++ b/provisioning_client/tests/hsm_client_key_ut/CMakeLists.txt
@ -16,7 +16,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        hsm_security_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/hsm_client_tpm_ut/CMakeLists.txt
+++ b/provisioning_client/tests/hsm_client_tpm_ut/CMakeLists.txt
@ -16,7 +16,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        hsm_security_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/hsm_client_x509_ut/CMakeLists.txt
+++ b/provisioning_client/tests/hsm_client_x509_ut/CMakeLists.txt
@ -16,7 +16,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        hsm_security_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/iothub_auth_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/iothub_auth_client_ut/CMakeLists.txt
@ -16,8 +16,11 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        hsm_security_client
        iothub_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_auth_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_auth_client_ut/CMakeLists.txt
@ -16,8 +16,11 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        hsm_security_client
        prov_device_ll_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_device_client_ll_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_device_client_ll_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_device_ll_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_device_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_device_client_ut/CMakeLists.txt
@ -15,8 +15,11 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_device_client
        parson
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_sasl_tpm_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_sasl_tpm_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_device_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_security_factory_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_security_factory_ut/CMakeLists.txt
@ -15,8 +15,11 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_device_client
        hsm_security_client
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_amqp_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_amqp_client_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_amqp_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_amqp_common_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_amqp_common_ut/CMakeLists.txt
@ -19,7 +19,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_amqp_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_amqp_ws_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_amqp_ws_client_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_amqp_ws_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_http_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_http_client_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_http_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_mqtt_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_mqtt_client_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_mqtt_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_mqtt_common_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_mqtt_common_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_mqtt_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/provisioning_client/tests/prov_transport_mqtt_ws_client_ut/CMakeLists.txt
+++ b/provisioning_client/tests/prov_transport_mqtt_ws_client_ut/CMakeLists.txt
@ -15,7 +15,10 @@ set(${theseTestsName}_c_files
 set(${theseTestsName}_h_files
 )

+file(COPY ../common_prov_e2e/prov_valgrind_suppression.supp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 build_c_test_artifacts(${theseTestsName} ON "tests/azure_prov_device_tests"
    ADDITIONAL_LIBS
        prov_mqtt_ws_transport
+    VALGRIND_SUPPRESSIONS_FILE 
+        prov_valgrind_suppression.supp
 )
--- a/samples/dockerbuilds/ARM/Dockerfile
+++ b/samples/dockerbuilds/ARM/Dockerfile
@ -26,7 +26,7 @@ ENV TOOLCHAIN_ARM=gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf
 ENV TOOLCHAIN_PLATFORM=arm-none-linux-gnueabihf
 ENV TOOLCHAIN_SYSROOT=${WORK_ROOT}/${TOOLCHAIN_ARM}
 ENV TOOLCHAIN_BIN=${WORK_ROOT}/${TOOLCHAIN_ARM}/bin
-ENV OPENSSL_ROOT_DIR=${WORK_ROOT}/openssl-OpenSSL_1_1_1f
+ENV OPENSSL_ROOT_DIR=${WORK_ROOT}/openssl-1.1.1v
 ENV TOOLCHAIN_PREFIX=${WORK_ROOT}/ARM
 ENV AR=${TOOLCHAIN_BIN}/${TOOLCHAIN_PLATFORM}-ar
 ENV CC=${TOOLCHAIN_BIN}/${TOOLCHAIN_PLATFORM}-gcc
@ -43,9 +43,9 @@ RUN tar -xvf ./${TOOLCHAIN_ARM}.tar.xz

 #########################################
 # Download and Configure OpenSSL
-RUN wget https://github.com/openssl/openssl/archive/refs/tags/OpenSSL_1_1_1f.tar.gz 
-RUN tar -xvf ./OpenSSL_1_1_1f.tar.gz 
-WORKDIR openssl-OpenSSL_1_1_1f 
+RUN wget https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1v/openssl-1.1.1v.tar.gz 
+RUN tar -xvf ./openssl-1.1.1v.tar.gz 
+WORKDIR openssl-1.1.1v 
 RUN ./Configure linux-armv4 --prefix=${TOOLCHAIN_PREFIX} --openssldir=${OPENSSL_ROOT_DIR} no-tests shared 
 RUN make 
 RUN make install_sw
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 49e9e5bc0b763ec16e35048fcd6f0b76f3e7535e
+Subproject commit 73f76373826a59774d81cb43d33eb665e36d3ee1
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit db8ae6543a1d6bae22e676af821362a90cb0f674
+Subproject commit e05cca6cdbc719ef11b02c4cd0cdf943725e0bf3