Skip to content

Commit f0065b3

Browse files
committed
update ecs, kmw, and oidc
1 parent d175491 commit f0065b3

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

.evergreen/run-mongodb-aws-ecs-test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ set -o xtrace
2222
# Install python with pip.
2323
PYTHON_VER="python3.10"
2424
apt-get -qq update < /dev/null > /dev/null
25+
apt-get -q install -y software-properties-common
26+
# Use openpgp to avoid gpg key timeout.
27+
mkdir -p $HOME/.gnupg
28+
echo "keyserver keys.openpgp.org" >> $HOME/.gnupg/gpg.conf
29+
add-apt-repository -y 'ppa:deadsnakes/ppa'
2530
apt-get -qq install $PYTHON_VER $PYTHON_VER-venv build-essential $PYTHON_VER-dev -y < /dev/null > /dev/null
2631

2732
export PYTHON_BINARY=$PYTHON_VER

.evergreen/scripts/kms_tester.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def _setup_azure_vm(base_env: dict[str, str]) -> None:
3333
env["AZUREKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential"
3434
run_command(f"{azure_dir}/run-command.sh", env=env)
3535

36-
env["AZUREKMS_CMD"] = "bash .evergreen/just.sh setup-tests kms azure-remote"
36+
env["AZUREKMS_CMD"] = "NO_EXT=1 bash .evergreen/just.sh setup-tests kms azure-remote"
3737
run_command(f"{azure_dir}/run-command.sh", env=env)
3838
LOGGER.info("Setting up Azure VM... done.")
3939

@@ -53,7 +53,7 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None:
5353
env["GCPKMS_CMD"] = "sudo apt-get install -y python3-dev build-essential"
5454
run_command(f"{gcp_dir}/run-command.sh", env=env)
5555

56-
env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-tests kms gcp-remote"
56+
env["GCPKMS_CMD"] = "NO_EXT=1 bash ./.evergreen/just.sh setup-tests kms gcp-remote"
5757
run_command(f"{gcp_dir}/run-command.sh", env=env)
5858
LOGGER.info("Setting up GCP VM...")
5959

@@ -98,6 +98,13 @@ def setup_kms(sub_test_name: str) -> None:
9898
if sub_test_target == "azure":
9999
os.environ["AZUREKMS_VMNAME_PREFIX"] = "PYTHON_DRIVER"
100100

101+
# Found using "az vm image list --output table"
102+
os.environ[
103+
"AZUREKMS_IMAGE"
104+
] = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest"
105+
else:
106+
os.environ["GCPKMS_IMAGEFAMILY"] = "debian-12"
107+
101108
run_command("./setup.sh", cwd=kms_dir)
102109
base_env = _load_kms_config(sub_test_target)
103110

.evergreen/scripts/oidc_tester.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ def setup_oidc(sub_test_name: str) -> dict[str, str] | None:
4242
if sub_test_name == "azure":
4343
env["AZUREOIDC_VMNAME_PREFIX"] = "PYTHON_DRIVER"
4444
if "-remote" not in sub_test_name:
45+
if sub_test_name == "azure":
46+
# Found using "az vm image list --output table"
47+
env["AZUREOIDC_IMAGE"] = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:latest"
48+
else:
49+
env["GCPKMS_IMAGEFAMILY"] = "debian-12"
4550
run_command(f"bash {target_dir}/setup.sh", env=env)
4651
if sub_test_name in K8S_NAMES:
4752
run_command(f"bash {target_dir}/setup-pod.sh {sub_test_name}")
@@ -84,7 +89,7 @@ def test_oidc_send_to_remote(sub_test_name: str) -> None:
8489
env[f"{upper_name}OIDC_DRIVERS_TAR_FILE"] = TMP_DRIVER_FILE
8590
env[
8691
f"{upper_name}OIDC_TEST_CMD"
87-
] = f"OIDC_ENV={sub_test_name} ./.evergreen/run-mongodb-oidc-test.sh"
92+
] = f"NO_EXT=1 OIDC_ENV={sub_test_name} ./.evergreen/run-mongodb-oidc-test.sh"
8893
elif sub_test_name in K8S_NAMES:
8994
env["K8S_DRIVERS_TAR_FILE"] = TMP_DRIVER_FILE
9095
env["K8S_TEST_CMD"] = "OIDC_ENV=k8s ./.evergreen/run-mongodb-oidc-test.sh"

.evergreen/scripts/setup_tests.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ def setup_libmongocrypt():
9090
distro = get_distro()
9191
if distro.name.startswith("Debian"):
9292
target = f"debian{distro.version_id}"
93+
elif distro.name.startswith("Ubuntu"):
94+
if distro.version_id == "20.04":
95+
target = "debian11"
96+
elif distro.version_id == "22.04":
97+
target = "debian12"
98+
elif distro.version_id == "24.04":
99+
target = "debian13"
93100
elif distro.name.startswith("Red Hat"):
94101
if distro.version_id.startswith("7"):
95102
target = "rhel-70-64-bit"

0 commit comments

Comments
 (0)