From cfa95825eebad3d8d9de0a4903523fd6a41184eb Mon Sep 17 00:00:00 2001
From: Richard Samuels <richard.l.samuels@gmail.com>
Date: Fri, 20 Nov 2020 12:23:16 -0500
Subject: [PATCH] SERVER-52775 Specify py-tpcc branch in sys perf and
 reorganize revisions

---
 etc/perf.yml        | 39 +++++----------------------------------
 etc/system_perf.yml | 39 +++++----------------------------------
 2 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/etc/perf.yml b/etc/perf.yml
index 246f94875b1..08c35e21cbd 100644
--- a/etc/perf.yml
+++ b/etc/perf.yml
@@ -93,6 +93,7 @@ modules:
 - name: py-tpcc
   repo: git@github.com:10gen/py-tpcc.git
   prefix: ../../src
+  branch: master
   ref: 52185e96bf28be6608ea65b61ff1d134b7cb3f13
 
 ###
@@ -134,7 +135,7 @@ functions:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
+        revisions: &revisions_list
           dsi: ${dsi_rev}
           genny: ${genny_rev}
           signal-processing: ${signal-processing_rev}
@@ -403,17 +404,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml
@@ -429,17 +420,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml
@@ -455,17 +436,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index f69d03c428f..4d5d1201376 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -107,6 +107,7 @@ modules:
 - name: py-tpcc
   repo: git@github.com:10gen/py-tpcc.git
   prefix: ../../src
+  branch: master
   ref: 52185e96bf28be6608ea65b61ff1d134b7cb3f13
 
 ###
@@ -149,7 +150,7 @@ functions:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
+        revisions: &revisions_list
           dsi: ${dsi_rev}
           genny: ${genny_rev}
           signal-processing: ${signal-processing_rev}
@@ -418,17 +419,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml
@@ -444,17 +435,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml
@@ -470,17 +451,7 @@ tasks:
     - command: git.get_project
       params:
         directory: *src_dir
-        revisions:
-          dsi: ${dsi_rev}
-          genny: ${genny_rev}
-          signal-processing: ${signal-processing_rev}
-          linkbench: ${linkbench_rev}
-          linkbench2: ${linkbench2_rev}
-          workloads: ${workloads_rev}
-          mongo-perf: ${mongo-perf_rev}
-          YCSB: ${YCSB_rev}
-          benchmarks: ${benchmarks_rev}
-          py-tpcc: ${py-tpcc_rev}
+        revisions: *revisions_list
     - command: expansions.write
       params:
         file: ./expansions.yml