Fix Windows cert path, start working on Codebuild

awslabs · May 3, 2023 · a9b1339 · a9b1339
1 parent 7dc45ae
commit a9b1339
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/codebuild/linux-integration-tests.yml b/codebuild/linux-integration-tests.yml
@@ -3,6 +3,11 @@ version: 0.2
 #additional packages we installed: cmake 3.5, libcrypto 1.1.0j, gcc 4.8.4
 env:
   shell: bash
+  variables:
+    BUILDER_VERSION: setup_crt_ci_from_action
+    BUILDER_SOURCE: channels
+    BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
+    PACKAGE_NAME: aws-crt-python
 phases:
   install:
     commands:
@@ -15,11 +20,10 @@ phases:
   build:
     commands:
       - echo Build started on `date`
-      - chmod a+xr ./codebuild/mqtt5_test_setup.sh
-      - source ./codebuild/mqtt5_test_setup.sh s3://aws-crt-test-stuff/TestIotProdMQTT5EnvironmentVariables.txt us-east-1
-      - aws s3 cp s3://aws-crt-test-stuff/setup_proxy_test_env.sh /tmp/setup_proxy_test_env.sh
-      - chmod a+xr /tmp/setup_proxy_test_env.sh
-      - $CODEBUILD_SRC_DIR/codebuild/linux-integration-tests.sh
+      - git submodule update --init
+      # Build library and test
+      - python3 -c "from urllib.request import urlretrieve; urlretrieve('$BUILDER_HOST/$BUILDER_SOURCE/$BUILDER_VERSION/builder.pyz?run=$CODEBUILD_BUILD_ID', 'builder.pyz')"
+      - python3 builder.pyz build --project aws-crt-python downstream
   post_build:
     commands:
       - echo Build completed on `date`

diff --git a/test/test_mqtt5_credentials.py b/test/test_mqtt5_credentials.py
@@ -131,7 +131,7 @@ def test_mqtt5_cred_windows_cert(self):
             port=8883
         )
         tls_ctx_options = io.TlsContextOptions.create_client_with_mtls_windows_cert_store_path(
-            _get_env_variable("AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS")
+            _get_env_variable("AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE")
         )
         client_options.tls_ctx = io.ClientTlsContext(tls_ctx_options)
 

diff --git a/test/test_mqtt_credentials.py b/test/test_mqtt_credentials.py
@@ -44,7 +44,7 @@ def test_mqtt311_cred_pkcs12(self):
 
     def test_mqtt311_cred_windows_cert(self):
         tls_ctx_options = TlsContextOptions.create_client_with_mtls_windows_cert_store_path(
-            _get_env_variable("AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS")
+            _get_env_variable("AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE")
         )
         elg = EventLoopGroup()
         resolver = DefaultHostResolver(elg)