SERVER-24669 Use configuration files for mongodb_setup

(cherry picked from commit 9eca478)
yanglimingcn · Jun 21, 2016 · 55f4ab7 · 55f4ab7
1 parent 9756d82
commit 55f4ab7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/etc/distributed_correctness.yml b/etc/distributed_correctness.yml
@@ -65,7 +65,7 @@ functions:
           bin/setup-cluster.sh ${cluster}
           echo "EC2 Cluster CREATED."
           touch terraform.tfstate.backup
-          tar -czvf cluster_config.tgz ips.sh ips.py terraform.tfstate.backup terraform.tfstate
+          tar -czvf cluster_config.tgz infrastructure_provisioning.out.yml ips.sh ips.py terraform.tfstate.backup terraform.tfstate
     - command: s3.put
       params:
         aws_key: ${aws_key}
@@ -105,7 +105,8 @@ functions:
           set -v
           source ./venv/bin/activate
           cd ./clusters/${cluster}
-          ../../bin/mongodb_setup.py ${setup} ${storageEngine}
+          cp mongodb_setup.${setup}.${storageEngine}.yml mongodb_setup.yml
+          ../../bin/mongodb_setup.py --config
           echo "${cluster} MongoDB Cluster STARTED."
 
   "run test":
@@ -154,6 +155,7 @@ functions:
           set -v
           cd ./clusters/${cluster}/reports
           # move additional file here
+          cp ../infrastructure_provisioning.out.yml .
           cp ../ips.sh .
           cp ../ips.py .
           if [ -f "../terraform.log" ]; then cp ../terraform.log .; fi

diff --git a/etc/longevity.yml b/etc/longevity.yml
@@ -76,8 +76,8 @@ functions:
           set -o verbose
           source ./venv/bin/activate
           cd ./clusters/${cluster}
-          ../../bin/mongodb_setup.py ${setup} ${storageEngine}
-          echo "${cluster} MongoDB Cluster STARTED."
+          cp mongodb_setup.${setup}.${storageEngine}.yml mongodb_setup.yml
+          ../../bin/mongodb_setup.py --config
 
   "run test":
     - command: shell.exec
@@ -126,6 +126,7 @@ functions:
           set -o verbose
           cd ./clusters/${cluster}/reports
           # move additional file here
+          cp ../infrastructure_provisioning.out.yml .
           cp ../ips.sh .
           cp ../ips.py .
           cp ../../perf_all.json .

diff --git a/etc/system_perf.yml b/etc/system_perf.yml
@@ -68,7 +68,7 @@ functions:
           # create all resources and instances
           ../../bin/setup-cluster.sh ${cluster}
           echo "EC2 Cluster CREATED."
-          tar -czvf cluster_config.tgz ips.sh ips.py terraform.tfstate cluster.tf terraform.tfvars variables.tf
+          tar -czvf cluster_config.tgz infrastructure_provisioning.out.yml ips.sh ips.py terraform.tfstate cluster.tf terraform.tfvars variables.tf
     - command: s3.put
       params:
         aws_key: ${aws_key}
@@ -108,8 +108,10 @@ functions:
           set -o verbose
           source ./venv/bin/activate
           cd ./clusters/${cluster}
-          ../../bin/mongodb_setup.py ${setup} ${storageEngine}
+          cp mongodb_setup.${setup}.${storageEngine}.yml mongodb_setup.yml
+          ../../bin/mongodb_setup.py --config
           echo "${cluster} MongoDB Cluster STARTED."
+
   "run test":
     - command: shell.exec
       params:
@@ -160,6 +162,7 @@ functions:
           set -o verbose
           cd ./clusters/${cluster}/reports
           # move additional file here
+          cp ../infrastructure_provisioning.out.yml .
           cp ../ips.sh .
           cp ../ips.py .
           if [ -f "../terraform.log" ]; then cp ../terraform.log .; fi
@@ -361,6 +364,9 @@ tasks:
   commands:
     - func: "prepare environment"
     - func: "restore cluster"
+    - func: "configure mongodb cluster"
+      vars:
+        storageEngine: "wiredTiger"
     - func: "run test"
       vars:
         storageEngine: "wiredTiger"
@@ -378,6 +384,9 @@ tasks:
   commands:
     - func: "prepare environment"
     - func: "restore cluster"
+    - func: "configure mongodb cluster"
+      vars:
+        storageEngine: "mmapv1"
     - func: "run test"
       vars:
         storageEngine: "mmapv1"