Skip to content

Commit 20d648b

Browse files
authored
use debian11-small on Azure KMS task (#2163)
Revert back to using the `debian11-small` distro. The `debian11-latest-small` does not have a new enought `az`. This is a short-term workaround until DEVPROD-23011 is resolved.
1 parent a1d8ec3 commit 20d648b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.evergreen/generated_configs/legacy-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10287,7 +10287,7 @@ buildvariants:
1028710287
- .versioned-api .8.0
1028810288
- name: testazurekms-variant
1028910289
display_name: Azure KMS
10290-
run_on: debian11-latest-small
10290+
run_on: debian11-small
1029110291
tasks:
1029210292
- testazurekms_task_group
1029310293
- testazurekms-fail-task

.evergreen/legacy_config_generator/evergreen_config_lib/testazurekms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ def _create_variant():
100100
return Variant(
101101
name='testazurekms-variant',
102102
display_name='Azure KMS',
103-
# Azure Virtual Machine created is Debian 10.
104-
run_on='debian11-latest-small',
103+
# Azure Virtual Machine created is Debian 11.
104+
run_on='debian11-small', # TODO: switch to 'debian11-latest-small' after DEVPROD-23011 fixed.
105105
tasks=['testazurekms_task_group', 'testazurekms-fail-task'],
106106
batchtime=20160,
107107
) # Use a batchtime of 14 days as suggested by the CSFLE test README

.evergreen/scripts/compile-test-azurekms.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ set -o nounset
77
ROOT=$(pwd)
88
INSTALL_DIR=$ROOT/install
99

10+
if [[ "${distro_id:?}" == "debian11-small" ]]; then
11+
# Temporary workaround for lack of uv on `debian11`. TODO: remove after DEVPROD-23011 is resolved.
12+
uv_dir="$(mktemp -d)"
13+
python3 -m virtualenv "${uv_dir:?}"
14+
# shellcheck source=/dev/null
15+
(. "${uv_dir:?}/bin/activate" && python -m pip install uv)
16+
PATH="${uv_dir:?}/bin:${PATH:-}"
17+
command -V uv >/dev/null
18+
fi
19+
1020
. .evergreen/scripts/install-build-tools.sh
1121
install_build_tools
1222
export CMAKE_GENERATOR="Ninja"

0 commit comments

Comments
 (0)