diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2019-07-19 18:04:35 -0400 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2019-07-19 18:04:35 -0400 |
| commit | bb345d7fef89ce43736d470ae496bb0f62d26351 (patch) | |
| tree | e617dd287b4b19a57e47effdf4050cc6cd1881b7 /etc | |
| parent | cf18a328e980a8c07f102fc55873aa6acbe3cbbe (diff) | |
| download | mongo-bb345d7fef89ce43736d470ae496bb0f62d26351.tar.gz | |
SERVER-42094 Fix usages of git.get_project in etc/perf.yml.
Consolidates all usages of the git.get_project command to a single
"git get project" function similar to what we do in etc/evergreen.yml
and etc/system_perf.yml. This ensures we clone the revision of the
enterprise module and genny repository specified in the manifest.
(cherry picked from commit 765ebd958a2358ce76528d002893c430741032de)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/perf.yml | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/etc/perf.yml b/etc/perf.yml index efc40607bb4..75fde6c605a 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -43,6 +43,8 @@ post: fi +# Be sure to add the module to git.get_project revisions parameter so the revision in the manifest +# is the version of the repository that's cloned. modules: - name: enterprise repo: git@github.com:10gen/mongo-enterprise-modules.git @@ -53,6 +55,14 @@ modules: branch: master functions: + "git get project": &git_get_project + command: git.get_project + params: + directory: src + revisions: # for each module include revision as <module_name> : ${<module_name>_rev} + enterprise: ${enterprise_rev} + genny: ${genny_rev} + "download analysis scripts": - command: shell.exec params: @@ -63,9 +73,7 @@ functions: git clone git@github.com:10gen/dsi.git # get the mongo source, note the s3.get calls put the # exe files in their respective make locations. - - command: git.get_project - params: - directory: src + - *git_get_project "start server": - command: shell.exec params: @@ -213,11 +221,10 @@ functions: # workload: the path relative to genny/src/workloads to run e.g. # scale/InsertRemove.yml "run genny workload": - - command: git.get_project - params: - directory: src - revisions: - genny: ${genny_rev} + # Calling the git.get_project command here will clone the mongodb/mongo repository, as well as + # the repositories defined in the build variant's "modules" section. Build variants running a + # task which calls this function must include "genny" as a module. + - *git_get_project - command: shell.exec params: working_dir: src/genny @@ -280,10 +287,9 @@ tasks: - name: compile commands: - - command: git.get_project - params: - directory: src - - command: manifest.load + # Calling the git.get_project command here will clone the mongodb/mongo repository, as well as + # the repositories defined in the build variant's "modules" section. + - func: "git get project" # We create a virtual environment with the Python dependencies for compiling the server # installed. - command: shell.exec |