From 87a5b5494b4a5a3647cf24c96557811d7987c6b7 Mon Sep 17 00:00:00 2001 From: Robert Guo Date: Tue, 12 Apr 2022 10:58:27 -0400 Subject: SERVER-64883 routine changes for branching --- etc/evergreen_yml_components/definitions.yml | 4 +-- etc/perf.yml | 2 +- etc/system_perf.yml | 48 +--------------------------- 3 files changed, 4 insertions(+), 50 deletions(-) (limited to 'etc') diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 40d62593132..391ea945299 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -71,7 +71,7 @@ modules: - name: enterprise repo: git@github.com:10gen/mongo-enterprise-modules.git prefix: src/mongo/db/modules - branch: master + branch: v6.0 - name: wtdevelop repo: git@github.com:wiredtiger/wiredtiger.git @@ -586,7 +586,7 @@ functions: "get buildnumber": &get_buildnumber command: keyval.inc params: - key: "${build_variant}_master" + key: "${build_variant}_v6.0" destination: "builder_num" "run diskstats": &run_diskstats diff --git a/etc/perf.yml b/etc/perf.yml index eb737631f49..a3590a8cb5b 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -104,7 +104,7 @@ modules: - name: enterprise repo: git@github.com:10gen/mongo-enterprise-modules.git prefix: src/mongo/db/modules - branch: master + branch: v6.0 - name: mongo-tools repo: git@github.com:mongodb/mongo-tools.git prefix: mongo-tools/src/github.com/mongodb diff --git a/etc/system_perf.yml b/etc/system_perf.yml index cf8021a9c2c..5f3f167f4d4 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -121,7 +121,7 @@ modules: - name: enterprise repo: git@github.com:10gen/mongo-enterprise-modules.git prefix: src/mongo/db/modules - branch: master + branch: v6.0 - name: mongo-tools repo: git@github.com:mongodb/mongo-tools.git prefix: mongo-tools/src/github.com/mongodb @@ -483,43 +483,6 @@ tasks: mongo-tools: ${mongo-tools_rev} - func: "compile mongodb" - - name: renew_ssl_cert - commands: - - command: git.get_project - params: - directory: *src_dir - revisions: - dsi: ${dsi_rev} - # Run the script to generate ssl cert files - - command: shell.exec - params: - script: AWS_ACCESS_KEY_ID=${terraform_key} AWS_SECRET_ACCESS_KEY=${terraform_secret} ./src/dsi/run-dsi generate_ssl_cert - # Upload files for further DSI usage - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: member.pem - # path to the remote file is intended to be static - remote_file: dsi/ssl/member.pem - bucket: mciuploads - # the visibility has to be public for consumption by DSI - permissions: public-read - content_type: text/plain - display_name: member.pem - - command: s3.put - params: - aws_key: ${aws_key} - aws_secret: ${aws_secret} - local_file: root.crt - # path to the remote file is intended to be static - remote_file: dsi/ssl/root.crt - bucket: mciuploads - # the visibility has to be public for consumption by DSI - permissions: public-read - content_type: text/plain - display_name: root.crt - - name: linkbench priority: 5 commands: @@ -1919,12 +1882,3 @@ buildvariants: - name: tpcc - name: linkbench - name: linkbench2 - - - name: renew-ssl-cert - display_name: Renew SSL Cert - cron: "0 0 * * 4" # 00:00 on Thursday - modules: *modules - run_on: # Certbot with route53 plugin is installed on Ubuntu 20.04 - - "ubuntu2004-small" - tasks: - - name: renew_ssl_cert -- cgit v1.2.1