Skip to content

Commit

Permalink
Disable upload to blob tests in C gates (#2621)
Browse files Browse the repository at this point in the history
* Disable upload to blob tests in C gates

This is a temporary measure until we set up the gates to workaround the guidance to disable azure storage SAS token authorization.

To reverse these changes:

In azure-iot-sdk-c/build:
sed -i "s/--no_uploadtoblob //g" .vsts-ci.yml

In azure-iot-sdk-c/jenkins:
grep -l run-e2e-tests *.sh | xargs sed -i "s/--no_uploadtoblob //g"
grep -l run-e2e-tests *.cmd | xargs sed -i "s/--no-uploadtoblob //g"

* Add guard in iothubclientcore_ut for DONT_USE_UPLOADTOBLOB

* Disable u2b tests in linux_openssl_engine.sh

* Fix arg-uploadtoblob label in build.cmd

* Disable upload to blob in remaining builds

* Fix more unit tests disabling u2b

* Fix iothubclientcore_ut.c

* Add new openssl valgrind exceptions
  • Loading branch information
ewertons authored Jun 7, 2024
1 parent 97ac6cc commit 8ebc30e
Show file tree
Hide file tree
Showing 17 changed files with 1,003 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build/.vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ jobs:
gcc --version
openssl version
curl --version
sudo -E env PATH="$PATH" ./build_all/linux/build.sh --run-unittests --run-e2e-tests --provisioning --use-hsmsymmkey --use-hsmsas --use-hsmx509 --use-edge-modules --use-ipv6-dualstack --config Debug
sudo -E env PATH="$PATH" ./build_all/linux/build.sh --run-unittests --run-e2e-tests --no_uploadtoblob --provisioning --use-hsmsymmkey --use-hsmsas --use-hsmx509 --use-edge-modules --use-ipv6-dualstack --config Debug
displayName: 'Build'
- script: |
export OPENSSL_ia32cap=0x00000000
Expand Down
12 changes: 9 additions & 3 deletions build_all/windows/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ set make=yes
set build_traceabilitytool=0
set prov_auth=OFF
set use_edge_modules=OFF
set no_uploadtoblob=OFF

:args-loop
if "%1" equ "" goto args-done
Expand All @@ -57,6 +58,7 @@ if "%1" equ "--no-make" goto arg-no-make
if "%1" equ "--build-traceabilitytool" goto arg-build-traceabilitytool
if "%1" equ "--provisioning" goto arg-provisioning
if "%1" equ "--use-edge-modules" goto arg-edge-modules
if "%1" equ "--no-uploadtoblob" goto arg-uploadtoblob
call :usage && exit /b 1

:arg-build-clean
Expand Down Expand Up @@ -119,6 +121,10 @@ goto args-continue
set use_edge_modules=ON
goto args-continue

:arg-uploadtoblob
set no_uploadtoblob=ON
goto args-continue

:args-continue
shift
goto args-loop
Expand Down Expand Up @@ -154,15 +160,15 @@ cmake --version

if %build-platform% == x64 (
echo ***Running CMAKE for Win64***
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=OFF -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A x64 -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Ddont_use_uploadtoblob:BOOL=%no_uploadtoblob% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=OFF -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A x64 -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
) else if %build-platform% == arm (
echo ***Running CMAKE for ARM***
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A ARM -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Ddont_use_uploadtoblob:BOOL=%no_uploadtoblob% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A ARM -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
) else (
echo ***Running CMAKE for Win32***
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A Win32 -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
cmake -LAH -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Ddont_use_uploadtoblob:BOOL=%no_uploadtoblob% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G %VSVERSION% -A Win32 -Duse_edge_modules=%use_edge_modules% -DCMAKE_BUILD_TYPE=%build-config%
if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
)

Expand Down
Loading

0 comments on commit 8ebc30e

Please sign in to comment.