From 6e144d8ee0e0399911e5cb4323e8f25a95f1ff2a Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Fri, 11 Oct 2024 22:20:18 +0000
Subject: [PATCH 1/2] backup existing buildspec

---
 codebuild/spec/buildspec_integv2batch2.yml | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 codebuild/spec/buildspec_integv2batch2.yml

diff --git a/codebuild/spec/buildspec_integv2batch2.yml b/codebuild/spec/buildspec_integv2batch2.yml
new file mode 100644
index 00000000000..542b10c3ebe
--- /dev/null
+++ b/codebuild/spec/buildspec_integv2batch2.yml
@@ -0,0 +1,36 @@
+batch:
+  build-matrix:
+    static:
+      env:
+        privileged-mode: true
+    dynamic:
+      buildspec:
+        - codebuild/spec/buildspec_ubuntu_integrationv2.yml
+      env:
+        compute-type:
+          - BUILD_GENERAL1_LARGE
+        image:
+          - 024603541914.dkr.ecr.us-west-2.amazonaws.com/docker:ubuntu18codebuild
+        variables:
+          S2N_BUILD_PRESET:
+            - awslc_gcc4-8
+            - awslc_gcc9
+            - awslc-fips_gcc4-8
+            - awslc-fips_gcc9
+            - awslc-fips-2022_gcc6
+            - libressl_gcc6
+            - libressl_gcc9
+            - boringssl
+            - openssl-1.0.2
+            - openssl-1.0.2-fips
+            - openssl-1.1.1_gcc4-8
+            - openssl-1.1.1_gcc6
+            - openssl-1.1.1_gcc6_softcrypto
+            - openssl-1.1.1_gcc9
+          INTEGV2_TEST: 
+            - "test_happy_path"
+            - "test_cross_compatibility test_client_authentication"
+            - "test_early_data test_sslyze test_well_known_endpoints test_hello_retry_requests test_sni_match test_pq_handshake test_fragmentation test_key_update"
+            - "test_session_resumption test_ocsp test_renegotiate test_renegotiate_apache"
+            - "test_dynamic_record_sizes test_npn test_signature_algorithms"
+            - "test_version_negotiation test_external_psk test_buffered_send"

From 19b82610b7ad03d9dbc7e6af431cae78099029c6 Mon Sep 17 00:00:00 2001
From: Doug Chapman <dougch@amazon.com>
Date: Fri, 11 Oct 2024 22:23:17 +0000
Subject: [PATCH 2/2] chore: remove redundant integ test

---
 codebuild/spec/buildspec_integv2batch2.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/codebuild/spec/buildspec_integv2batch2.yml b/codebuild/spec/buildspec_integv2batch2.yml
index 542b10c3ebe..4ceea57cbc4 100644
--- a/codebuild/spec/buildspec_integv2batch2.yml
+++ b/codebuild/spec/buildspec_integv2batch2.yml
@@ -20,17 +20,14 @@ batch:
             - awslc-fips-2022_gcc6
             - libressl_gcc6
             - libressl_gcc9
-            - boringssl
             - openssl-1.0.2
             - openssl-1.0.2-fips
             - openssl-1.1.1_gcc4-8
             - openssl-1.1.1_gcc6
             - openssl-1.1.1_gcc6_softcrypto
             - openssl-1.1.1_gcc9
-          INTEGV2_TEST: 
+          INTEGV2_TEST:
             - "test_happy_path"
-            - "test_cross_compatibility test_client_authentication"
-            - "test_early_data test_sslyze test_well_known_endpoints test_hello_retry_requests test_sni_match test_pq_handshake test_fragmentation test_key_update"
-            - "test_session_resumption test_ocsp test_renegotiate test_renegotiate_apache"
-            - "test_dynamic_record_sizes test_npn test_signature_algorithms"
-            - "test_version_negotiation test_external_psk test_buffered_send"
+            - "test_sslyze test_fragmentation test_key_update"
+            - "test_session_resumption test_dynamic_record_sizes"
+            - "test_version_negotiation test_external_psk"