Skip to content

Commit 56584eb

Browse files
eramongodberamongodb
authored
Update r1.30 EVG config to support new EVG project (#1975)
* CDRIVER-5932 Simplify version calculations (#1943) * Fix S3 upload paths to continue using mongo-c-driver root directory * Remove macos-11-arm64 tasks for server 8.0+ (#1954) * CDRIVER-5917 drop tasks on windows-64-vs2015 (#1924)
1 parent e3dc1a1 commit 56584eb

33 files changed

+117
-791
lines changed

‎.evergreen/config_generator/components/abi_compliance_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CheckABICompliance(Function):
2828
'AWS_SECRET_ACCESS_KEY': '${aws_secret}',
2929
},
3030
script='''\
31-
aws s3 cp abi-compliance/compat_reports s3://mciuploads/${project}/${build_variant}/${revision}/${version_id}/${build_id}/abi-compliance/compat_reports --recursive --acl public-read --region us-east-1
31+
aws s3 cp abi-compliance/compat_reports s3://mciuploads/mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/abi-compliance/compat_reports --recursive --acl public-read --region us-east-1
3232
[[ ! -f ./abi-compliance/abi-error.txt ]]
3333
'''
3434
),
@@ -40,7 +40,7 @@ class CheckABICompliance(Function):
4040
display_name='ABI Report:',
4141
local_files_include_filter='mongoc/abi-compliance/compat_reports/**/*.html',
4242
permissions='public-read',
43-
remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/abi-compliance/compat_report.html',
43+
remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/abi-compliance/compat_report.html',
4444
),
4545
]
4646

‎.evergreen/config_generator/components/cse/winssl.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# pylint: disable=line-too-long
1515
# fmt: off
1616
COMPILE_MATRIX = [
17-
('windows-64-vs2015', 'vs2015x64', None, ['cyrus']),
1817
('windows-vsCurrent', 'vs2017x64', None, ['cyrus']),
1918
]
2019

‎.evergreen/config_generator/components/funcs/fetch_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class FetchBuild(Function):
1717
aws_secret='${aws_secret}',
1818
bucket='mciuploads',
1919
local_file='build.tar.gz',
20-
remote_file='${project}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz',
20+
remote_file='mongo-c-driver/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz',
2121
),
2222
archive_targz_extract(path='build.tar.gz', destination='mongoc'),
2323
# Scripts may not be executable on Windows.

‎.evergreen/config_generator/components/funcs/fetch_source.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@ class FetchSource(Function):
1818
set -o errexit
1919
set -o pipefail
2020
if [ -n "${github_pr_number}" -o "${is_patch}" = "true" ]; then
21-
# This is a GitHub PR or patch build, probably branched from master
22-
if command -v python3 &>/dev/null; then
23-
# Prefer python3 if it is available
24-
echo $(python3 ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
25-
else
26-
echo $(python ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
27-
fi
28-
VERSION=$VERSION_CURRENT-${version_id}
21+
VERSION=patch-${version_id}
2922
else
3023
VERSION=latest
3124
fi

‎.evergreen/config_generator/components/funcs/upload_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class UploadBuild(Function):
1414
s3_put(
1515
aws_key='${aws_key}',
1616
aws_secret='${aws_secret}',
17-
remote_file='${project}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz',
17+
remote_file='mongo-c-driver/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz',
1818
bucket='mciuploads',
1919
permissions='public-read',
2020
local_file='${build_id}.tar.gz',

‎.evergreen/config_generator/components/funcs/upload_mo_artifacts.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class UploadMOArtifacts(Function):
3030
local_file='mongoc/mongodb-logs.tar.gz',
3131
optional=True,
3232
permissions='public-read',
33-
remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz',
33+
remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz',
3434
),
3535
s3_put(
3636
aws_key='${aws_key}',
@@ -41,7 +41,7 @@ class UploadMOArtifacts(Function):
4141
local_file='mongoc/MO/server.log',
4242
optional=True,
4343
permissions='public-read',
44-
remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log',
44+
remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log',
4545
),
4646
bash_exec(
4747
working_dir='mongoc',
@@ -83,7 +83,7 @@ class UploadMOArtifacts(Function):
8383
local_file='mongo-coredumps.tgz',
8484
optional=True,
8585
permissions='public-read',
86-
remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log',
86+
remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log',
8787
),
8888
]
8989

‎.evergreen/config_generator/components/make_docs.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class UploadDocs(Function):
3939
"AWS_ACCESS_KEY_ID": "${aws_key}",
4040
"AWS_SECRET_ACCESS_KEY": "${aws_secret}",
4141
},
42-
script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
42+
script="aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
4343
),
4444
s3_put(
4545
aws_key="${aws_key}",
@@ -49,15 +49,15 @@ class UploadDocs(Function):
4949
display_name="libbson docs",
5050
local_file="mongoc/_build/for-docs/src/libbson/doc/html/index.html",
5151
permissions="public-read",
52-
remote_file="${project}/docs/libbson/${CURRENT_VERSION}/index.html",
52+
remote_file="mongo-c-driver/docs/libbson/${CURRENT_VERSION}/index.html",
5353
),
5454
bash_exec(
5555
working_dir="mongoc/_build/for-docs/src/libmongoc",
5656
env={
5757
"AWS_ACCESS_KEY_ID": "${aws_key}",
5858
"AWS_SECRET_ACCESS_KEY": "${aws_secret}",
5959
},
60-
script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
60+
script="aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
6161
),
6262
s3_put(
6363
aws_key="${aws_key}",
@@ -67,7 +67,7 @@ class UploadDocs(Function):
6767
display_name="libmongoc docs",
6868
local_file="mongoc/_build/for-docs/src/libmongoc/doc/html/index.html",
6969
permissions="public-read",
70-
remote_file="${project}/docs/libmongoc/${CURRENT_VERSION}/index.html",
70+
remote_file="mongo-c-driver/docs/libmongoc/${CURRENT_VERSION}/index.html",
7171
),
7272
]
7373

@@ -102,7 +102,7 @@ class UploadManPages(Function):
102102
display_name="libbson man pages",
103103
local_file="mongoc/bson-man-pages.html",
104104
permissions="public-read",
105-
remote_file="${project}/man-pages/libbson/${CURRENT_VERSION}/index.html",
105+
remote_file="mongo-c-driver/man-pages/libbson/${CURRENT_VERSION}/index.html",
106106
),
107107
s3_put(
108108
aws_key="${aws_key}",
@@ -112,7 +112,7 @@ class UploadManPages(Function):
112112
display_name="libmongoc man pages",
113113
local_file="mongoc/mongoc-man-pages.html",
114114
permissions="public-read",
115-
remote_file="${project}/man-pages/libmongoc/${CURRENT_VERSION}/index.html",
115+
remote_file="mongo-c-driver/man-pages/libmongoc/${CURRENT_VERSION}/index.html",
116116
),
117117
]
118118

‎.evergreen/config_generator/components/sasl/darwinssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
TEST_MATRIX = [
2525
('macos-14', 'clang', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0']),
2626

27-
('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']),
27+
('macos-11-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', ]),
2828
('macos-14-arm64', 'clang', None, 'cyrus', ['auth'], ['server'], ['6.0', '7.0', '8.0', 'latest']),
2929
]
3030
# fmt: on

‎.evergreen/config_generator/components/sasl/winssl.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# pylint: disable=line-too-long
1616
# fmt: off
1717
COMPILE_MATRIX = [
18-
('windows-64-vs2015', 'vs2015x64', None, [ 'cyrus', ]),
19-
('windows-64-vs2015', 'vs2015x86', None, ['off', ]),
2018
('windows-vsCurrent', 'mingw', None, [ 'sspi']),
2119
('windows-vsCurrent', 'vs2017x64', None, ['off', 'cyrus', 'sspi']),
2220
('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']),

‎.evergreen/config_generator/components/sbom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class SBOM(Function):
8080
display_name='Augmented SBOM',
8181
local_file='mongoc/augmented-sbom.json',
8282
permissions='public-read',
83-
remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json',
83+
remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json',
8484
),
8585
]
8686

0 commit comments

Comments
 (0)