Removing omnibus changes until the next PR

aws · Jun 1, 2023 · 8cf3212 · 8cf3212
1 parent 34f0d2e
commit 8cf3212
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/codebuild/bin/test_dynamic_load.sh b/codebuild/bin/test_dynamic_load.sh
@@ -43,7 +43,7 @@ fi
 
 # Run the test with the path to libs2n
 echo "Running s2n_dynamic_load_test"
-./s2n_dynamic_load_test $WORK_DIR/s2n-install-shared/lib/libs2n.so
+LD_LIBRARY_PATH=$LIBCRYPTO_ROOT/lib ./s2n_dynamic_load_test $WORK_DIR/s2n-install-shared/lib/libs2n.so
 returncode=$?
 if [ $returncode -ne 0 ]; then
     echo "test failure: s2n_dynamic_load_test did not succeed"

diff --git a/codebuild/spec/buildspec_omnibus.yml b/codebuild/spec/buildspec_omnibus.yml
@@ -219,17 +219,6 @@ batch:
           TESTS: sharedandstatic
           # must use the libcrypto that's actually installed on the system
           S2N_LIBCRYPTO: openssl-1.1.1
-
-    - identifier: s2nDynamicLoad
-      buildspec: codebuild/spec/buildspec_ubuntu.yml
-      env:
-        compute-type: BUILD_GENERAL1_SMALL
-        image: 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
-        privileged-mode: true
-        variables:
-          TESTS: dynamicload
-          # must use the libcrypto that's actually installed on the system
-          S2N_LIBCRYPTO: openssl-1.1.1
 
     - buildspec: codebuild/spec/buildspec_ubuntu.yml
       env: