change automatic benchmark

Jenkinsfile.benchmark

@@ -3,16 +3,28 @@ properties([
                 string(name: 'BENCHMARK_GITHUB_ORG', defaultValue: 'PegaSysEng', description: 'The user or org from which to checkout the benchmark repo', trim: true),
                 string(name: 'BENCHMARK_REPO', defaultValue: 'pantheon-benchmark', description: 'The benchmark repo to be checked out', trim: true),
                 string(name: 'BENCHMARK_BRANCH', defaultValue: 'master', description: 'The benchmark branch to be checked out', trim: true),
-                choice(name: 'NETWORK', choices: ['ropsten', 'mainnet'], description: 'The name of the network being tested', trim: true),
-                choice(name: 'DATASET', choices: ['from-0-by-100k', 'from-0-to-1m', 'from-0', 'from-6784589'], description: 'Ropsten: choose from-0-by-100k or from-0-to-1m, Mainnet choose from-0 or from-from-6784589', trim: true),
-                choice(name: 'IMPORT_FILE', choices: ['ropsten-000k-100k.blocks', 'ropsten-0-1M.blocks', '0-999.blocks', '6784590-6785589.blocks'], description: 'The name of the file to import, same ordial position as DATASET', trim: true)
+                choice(name: 'NETWORK', choices: ['ropsten', 'rinkeby', 'goerli', 'mainnet'], description: 'The name of the network being tested', trim: true),
+
+                // For File Import
+                //  choice(name: 'DATASET', choices: ['from-0-by-100k', 'from-0-to-1m', 'from-0', 'from-6784589'], description: 'Ropsten: choose from-0-by-100k or from-0-to-1m, Mainnet choose from-0 or from-from-6784589', trim: true),
+                //  choice(name: 'IMPORT_FILE', choices: ['ropsten-000k-100k.blocks', 'ropsten-0-1M.blocks', '0-999.blocks', '6784590-6785589.blocks'], description: 'The name of the file to import, same ordial position as DATASET', trim: true)
+
+                // For Network Import
+                choice(name: 'PANTHEON_SYNC_MODE', choices: ['FULL', 'FAST'], description: 'The mode of network syncing to perform', trim: true),
+                string(name: 'PANTHEON_MIN_PEERS', defaultValue: '2', description: 'Minimum number of peers to wait for before gathering data', trim: true),
+                string(name: 'PANTHEON_BENCHMARK_DURATION', defaultValue: '30', description: 'Maximum number of minutes to run the benchmark (full sync ends the benchmark early)', trim: true),
         ])
 ])
 
 pipeline {
     agent {
         docker {
-            image "pantheon-benchmarks/${params.NETWORK}-${params.DATASET}-pantheon:latest"
+            // For File Import
+            // image "pantheon-benchmarks/${params.NETWORK}-${params.DATASET}-pantheon:latest"
+
+            // For Network Import
+            image "pantheon-benchmarks/mainnet-from-0-pantheon:latest"
+
             label 'jenkins-benchmark-1'
             args '-v /benchmarks/block-import:/benchmarks-data'
         }
@@ -39,7 +51,7 @@ pipeline {
                 ]) {
                     dir('pantheon-benchmarks') {
                         script {
-                            evaluate(readFile('jenkins/Jenkinsfile.pantheon-block-import'))
+                            evaluate(readFile('jenkins/Jenkinsfile.pantheon-network-import'))
                         }
                     }
                 }