Skip to content

Commit c433170

Browse files
authored
Move install-binaries test to a script and fix failing test (#714)
1 parent c92d062 commit c433170

4 files changed

Lines changed: 36 additions & 26 deletions

File tree

.evergreen/config.yml

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -495,32 +495,12 @@ functions:
495495
make test
496496
497497
"run install binaries test":
498-
- command: shell.exec
498+
- command: subprocess.exec
499499
type: test
500500
params:
501-
shell: bash
502-
script: |-
503-
set -o errexit
504-
cd ${DRIVERS_TOOLS}
505-
if [ -z "${SKIP_NODE}" ]; then
506-
.evergreen/install-node.sh
507-
fi
508-
.evergreen/install-rust.sh
509-
PATH=.bin:$PATH
510-
if [ $OS == "Windows_NT" ]; then
511-
exit 0
512-
fi
513-
case $(uname -m) in
514-
aarch64 | x86_64 | arm64)
515-
. ./.evergreen/ensure-binary.sh gcloud
516-
gcloud --version
517-
. ./.evergreen/ensure-binary.sh kubectl
518-
which kubectl
519-
;;
520-
esac
521-
# Generate a test results file
522-
cd ${PROJECT_DIRECTORY}
523-
make test
501+
binary: bash
502+
include_expansions_in_env: [SKIP_NODE]
503+
args: [src/.evergreen/tests/test-install-binaries.sh]
524504

525505
"run aws test":
526506
- command: subprocess.exec

.evergreen/k8s/gke/setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
image: debian:12
4848
resources:
4949
limits:
50-
memory: "4Gi"
50+
memory: "8Gi"
5151
cpu: "1"
5252
ephemeral-storage: "8Gi"
5353
command: ["/bin/sleep", "3650d"]

.evergreen/k8s/remote-scripts/setup-pod.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eu
33

44
echo "Installing dependencies ... begin"
5-
apt-get -qq update
5+
apt-get -qq -o DPkg::Lock::Timeout=-1 update
66
# Same dependencies used in KMS testing.
77
export DEBIAN_FRONTEND=noninteractive
88
apt-get -qq -y -o DPkg::Lock::Timeout=-1 install libcurl4 libgssapi-krb5-2 libldap-common libwrap0 libsasl2-2 \
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
4+
SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
5+
. $SCRIPT_DIR/../handle-paths.sh
6+
7+
pushd $SCRIPT_DIR/..
8+
9+
if [ -z "${SKIP_NODE:-}" ]; then
10+
./install-node.sh
11+
fi
12+
13+
./install-rust.sh
14+
15+
if [ ${OS:-} != "Windows_NT" ]; then
16+
# Add a suitable python3 to the path.
17+
PYTHON_BINARY=$(bash -c ". $SCRIPT_DIR/../find-python3.sh && ensure_python3 2>/dev/null")
18+
PATH="$(dirname $PYTHON_BINARY):$PATH"
19+
case $(uname -m) in
20+
aarch64 | x86_64 | arm64)
21+
. ./ensure-binary.sh gcloud
22+
gcloud --version
23+
. ./ensure-binary.sh kubectl
24+
which kubectl
25+
;;
26+
esac
27+
fi
28+
29+
popd
30+
make -C ${DRIVERS_TOOLS} test

0 commit comments

Comments
 (0)