Skip to content

Commit 6168d3a

Browse files
committed
fix azure setup
1 parent 76cc63f commit 6168d3a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.evergreen/scripts/kms_tester.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ def setup_kms(sub_test_name: str) -> None:
8383
if sub_test_type == "remote":
8484
return
8585

86+
if sub_test_target == "azure":
87+
run_command("./setup-secrets.sh", cwd=kms_dir)
88+
8689
if success:
8790
_create_archive()
8891
if sub_test_target == "azure":
@@ -97,14 +100,13 @@ def setup_kms(sub_test_name: str) -> None:
97100
_setup_gcp_vm(base_env)
98101

99102
if sub_test_target == "azure":
100-
run_command("./setup-secrets.sh", cwd=kms_dir)
101103
config = read_env(f"{kms_dir}/secrets-export.sh")
102104
write_env("KEY_NAME", config["AZUREKMS_KEYNAME"])
103105
write_env("KEY_VAULT_ENDPOINT", config["AZUREKMS_KEYVAULTENDPOINT"])
104-
write_env("AZUREKMS_VMNAME", config["AZUREKMS_KEYNAME"])
106+
write_env("AZUREKMS_VMNAME", config["AZUREKMS_VMNAME"])
105107

106108

107-
def test_kms_vm(sub_test_name: str) -> None:
109+
def test_kms_remote(sub_test_name: str) -> None:
108110
env = _load_kms_config(sub_test_name)
109111
if sub_test_name == "azure":
110112
key_name = os.environ["KEY_NAME"]

.evergreen/scripts/run_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ def run() -> None:
101101

102102
# Run remote kms tests.
103103
if TEST_NAME == "kms" and SUB_TEST_NAME in ["azure", "gcp"]:
104-
from kms_tester import test_kms_vm
104+
from kms_tester import test_kms_remote
105105

106-
test_kms_vm(SUB_TEST_NAME)
106+
test_kms_remote(SUB_TEST_NAME)
107107
return
108108

109109
# Run local tests.

0 commit comments

Comments
 (0)