Skip to content

Commit 4597127

Browse files
eramongodberamongodb
committed
Use Alpine 3 instead of 3.18
1 parent aecf9b5 commit 4597127

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎.evergreen/config_generator/components/earthly.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
T = TypeVar("T")
1313

1414
# Identifiers for environments. These correspond to special '*-env' targets in the Earthfile.
15-
EnvKey = Literal["ubuntu2204", "alpine3.18", "archlinux"]
15+
EnvKey = Literal["ubuntu2204", "alpine3", "archlinux"]
1616

1717
# A mapping from environment keys to 'pretty' environment names.
1818
_ENV_NAMES: dict[EnvKey, str] = {
1919
"ubuntu2204": "Ubuntu 22.04",
20-
"alpine3.18": "Alpine 3.18",
20+
"alpine3": "Alpine 3",
2121
"archlinux": "Arch Linux",
2222
}
2323

‎.evergreen/generated_configs/tasks.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,8 +1985,8 @@ tasks:
19851985
- func: bootstrap-mongo-orchestration
19861986
- func: run-mock-kms-servers
19871987
- func: run-tests
1988-
- name: earthly-alpine3.18-sasl-cyrus-tls-libressl-version-master
1989-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
1988+
- name: earthly-alpine3-sasl-cyrus-tls-libressl-version-master
1989+
tags: [earthly, pr-merge-gate, earthly-alpine3]
19901990
commands:
19911991
- command: subprocess.exec
19921992
type: setup
@@ -1995,17 +1995,17 @@ tasks:
19951995
working_dir: mongoc
19961996
args:
19971997
- -c
1998-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=libressl --version=master
1998+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=libressl --version=master
19991999
- command: subprocess.exec
20002000
type: test
20012001
params:
20022002
binary: bash
20032003
working_dir: mongoc
20042004
args:
20052005
- -c
2006-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=libressl --version=master
2007-
- name: earthly-alpine3.18-sasl-cyrus-tls-libressl-version-r3.8.0
2008-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
2006+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=libressl --version=master
2007+
- name: earthly-alpine3-sasl-cyrus-tls-libressl-version-r3.8.0
2008+
tags: [earthly, pr-merge-gate, earthly-alpine3]
20092009
commands:
20102010
- command: subprocess.exec
20112011
type: setup
@@ -2014,17 +2014,17 @@ tasks:
20142014
working_dir: mongoc
20152015
args:
20162016
- -c
2017-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=libressl --version=r3.8.0
2017+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=libressl --version=r3.8.0
20182018
- command: subprocess.exec
20192019
type: test
20202020
params:
20212021
binary: bash
20222022
working_dir: mongoc
20232023
args:
20242024
- -c
2025-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=libressl --version=r3.8.0
2026-
- name: earthly-alpine3.18-sasl-cyrus-tls-off-version-master
2027-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
2025+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=libressl --version=r3.8.0
2026+
- name: earthly-alpine3-sasl-cyrus-tls-off-version-master
2027+
tags: [earthly, pr-merge-gate, earthly-alpine3]
20282028
commands:
20292029
- command: subprocess.exec
20302030
type: setup
@@ -2033,17 +2033,17 @@ tasks:
20332033
working_dir: mongoc
20342034
args:
20352035
- -c
2036-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=off --version=master
2036+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=off --version=master
20372037
- command: subprocess.exec
20382038
type: test
20392039
params:
20402040
binary: bash
20412041
working_dir: mongoc
20422042
args:
20432043
- -c
2044-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=off --version=master
2045-
- name: earthly-alpine3.18-sasl-cyrus-tls-off-version-r3.8.0
2046-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
2044+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=off --version=master
2045+
- name: earthly-alpine3-sasl-cyrus-tls-off-version-r3.8.0
2046+
tags: [earthly, pr-merge-gate, earthly-alpine3]
20472047
commands:
20482048
- command: subprocess.exec
20492049
type: setup
@@ -2052,17 +2052,17 @@ tasks:
20522052
working_dir: mongoc
20532053
args:
20542054
- -c
2055-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=off --version=r3.8.0
2055+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=off --version=r3.8.0
20562056
- command: subprocess.exec
20572057
type: test
20582058
params:
20592059
binary: bash
20602060
working_dir: mongoc
20612061
args:
20622062
- -c
2063-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=off --version=r3.8.0
2064-
- name: earthly-alpine3.18-sasl-cyrus-tls-openssl-version-master
2065-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
2063+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=off --version=r3.8.0
2064+
- name: earthly-alpine3-sasl-cyrus-tls-openssl-version-master
2065+
tags: [earthly, pr-merge-gate, earthly-alpine3]
20662066
commands:
20672067
- command: subprocess.exec
20682068
type: setup
@@ -2071,17 +2071,17 @@ tasks:
20712071
working_dir: mongoc
20722072
args:
20732073
- -c
2074-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=openssl --version=master
2074+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=openssl --version=master
20752075
- command: subprocess.exec
20762076
type: test
20772077
params:
20782078
binary: bash
20792079
working_dir: mongoc
20802080
args:
20812081
- -c
2082-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=openssl --version=master
2083-
- name: earthly-alpine3.18-sasl-cyrus-tls-openssl-version-r3.8.0
2084-
tags: [earthly, pr-merge-gate, earthly-alpine3.18]
2082+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=openssl --version=master
2083+
- name: earthly-alpine3-sasl-cyrus-tls-openssl-version-r3.8.0
2084+
tags: [earthly, pr-merge-gate, earthly-alpine3]
20852085
commands:
20862086
- command: subprocess.exec
20872087
type: setup
@@ -2090,15 +2090,15 @@ tasks:
20902090
working_dir: mongoc
20912091
args:
20922092
- -c
2093-
- ./tools/earthly.sh +env-warmup --env=alpine3.18 --sasl=cyrus --tls=openssl --version=r3.8.0
2093+
- ./tools/earthly.sh +env-warmup --env=alpine3 --sasl=cyrus --tls=openssl --version=r3.8.0
20942094
- command: subprocess.exec
20952095
type: test
20962096
params:
20972097
binary: bash
20982098
working_dir: mongoc
20992099
args:
21002100
- -c
2101-
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3.18 --sasl=cyrus --tls=openssl --version=r3.8.0
2101+
- ./tools/earthly.sh +run --targets="test-example test-cxx-driver" --env=alpine3 --sasl=cyrus --tls=openssl --version=r3.8.0
21022102
- name: earthly-archlinux-sasl-cyrus-tls-libressl-version-master
21032103
tags: [earthly, pr-merge-gate, earthly-archlinux]
21042104
commands:

‎Earthfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PREP_CMAKE:
3131
# Create the VERSION_CURRENT file using Git. This file is exported as an artifact at /
3232
version-current:
3333
# Run on Alpine, which does this work the fastest
34-
FROM alpine:3.18
34+
FROM alpine:3
3535
# Install Python and Git, the only things required for this job:
3636
RUN apk add git python3
3737
COPY --dir .git/ build/calc_release_version.py /s/
@@ -110,13 +110,13 @@ alpine-test-env-base:
110110
FROM +alpine-base --version=$version
111111
RUN apk add snappy
112112

113-
# alpine3.18-build-env :
114-
# A build environment based on Alpine Linux version 3.18
115-
alpine3.18-build-env:
116-
FROM +alpine-build-env-base --version=3.18
113+
# alpine3-build-env :
114+
# A build environment based on Alpine Linux version 3
115+
alpine3-build-env:
116+
FROM +alpine-build-env-base --version=3
117117

118-
alpine3.18-test-env:
119-
FROM +alpine-test-env-base --version=3.18
118+
alpine3-test-env:
119+
FROM +alpine-test-env-base --version=3
120120

121121
archlinux-base:
122122
FROM archlinux
@@ -236,12 +236,12 @@ test-cxx-driver:
236236

237237
# Simultaneously builds and tests multiple different platforms
238238
multibuild:
239-
BUILD +test-example --env=ubuntu2204 --env=archlinux --env=alpine3.18 \
239+
BUILD +test-example --env=ubuntu2204 --env=archlinux --env=alpine3 \
240240
--sasl=cyrus --sasl=off \
241241
--tls=openssl --tls=off
242242
# Note: At time of writing, Ubuntu does not support libressl, so run those
243243
# tests on a separate BUILD line that does not include Ubuntu:
244-
BUILD +test-example --env=archlinux --env=alpine3.18 \
244+
BUILD +test-example --env=archlinux --env=alpine3 \
245245
--sasl=cyrus --sasl=off \
246246
--tls=libressl
247247

@@ -272,7 +272,7 @@ test-vcpkg-manifest-mode:
272272
make test-manifest-mode
273273

274274
vcpkg-base:
275-
FROM alpine:3.18
275+
FROM alpine:3
276276
RUN apk add cmake curl gcc g++ musl-dev ninja-is-really-ninja zip unzip tar \
277277
build-base git pkgconf perl bash linux-headers
278278
ENV VCPKG_ROOT=/opt/vcpkg-git

0 commit comments

Comments
 (0)