|
14 | 14 | environment variables, secrets, files, etc. that is used to build up the testing environment.
|
15 | 15 | """
|
16 | 16 |
|
| 17 | +# TODO: The variable is used to disable the windows certificate store test to unblock a CI failure. |
| 18 | +# The variable should be set to TRUE after the CI is fixed. |
| 19 | +ENABLE_WINDOWS_CERT_STORE_TEST = False |
| 20 | + |
17 | 21 |
|
18 | 22 | class SetupCrossCICrtEnvironment(Action):
|
19 | 23 |
|
@@ -145,6 +149,12 @@ def _setenv_profile_file(self, env, profile_env_name, config_env_name, access_ke
|
145 | 149 | print("[ERROR]: Could not get create profile with name: " + str(profile_env_name))
|
146 | 150 | raise ValueError("Exception occurred trying to create profile")
|
147 | 151 |
|
| 152 | + def _setup_windows_cert_store_test(self, env, certificate_env_name, cerfiticate_s3_path, store_location_env_name): |
| 153 | + if (self.is_windows == True and ENABLE_WINDOWS_CERT_STORE_TEST == True): |
| 154 | + self._setenv_s3(env, certificate_env_name, cerfiticate_s3_path) |
| 155 | + helpers.create_windows_cert_store( |
| 156 | + env, certificate_env_name, store_location_env_name) |
| 157 | + |
148 | 158 | def _common_setup(self, env):
|
149 | 159 |
|
150 | 160 | ################################################
|
@@ -223,14 +233,9 @@ def _common_setup(self, env):
|
223 | 233 | "s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
|
224 | 234 | self._setenv(env, "AWS_TEST_MQTT5_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")
|
225 | 235 |
|
226 |
| - # TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once |
227 |
| - # it is fixed. |
228 | 236 | # Windows Key Cert
|
229 |
| - # if (self.is_windows == True): |
230 |
| - # self._setenv_s3(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", |
231 |
| - # "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx") |
232 |
| - # helpers.create_windows_cert_store( |
233 |
| - # env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE") |
| 237 | + self._setup_windows_cert_store_test(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", |
| 238 | + "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE") |
234 | 239 |
|
235 | 240 | # X509
|
236 | 241 | self._setenv_secret(env, "AWS_TEST_MQTT5_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
|
@@ -313,14 +318,10 @@ def _common_setup(self, env):
|
313 | 318 | "s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
|
314 | 319 | self._setenv(env, "AWS_TEST_MQTT311_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")
|
315 | 320 |
|
316 |
| - # TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once |
317 |
| - # it is fixed. |
318 | 321 | # Windows Key Cert
|
319 |
| - # if (self.is_windows == True): |
320 |
| - # self._setenv_s3(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", |
321 |
| - # "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx") |
322 |
| - # helpers.create_windows_cert_store( |
323 |
| - # env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE") |
| 322 | + self._setup_windows_cert_store_test(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", |
| 323 | + "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx", |
| 324 | + "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE") |
324 | 325 |
|
325 | 326 | # X509
|
326 | 327 | self._setenv_secret(env, "AWS_TEST_MQTT311_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
|
|
0 commit comments