@@ -260,6 +260,7 @@ class CommonJobProperties {
260
260
bigquery_table : ' beam_performance.pkb_results' ,
261
261
k8s_get_retry_count : 36 , // wait up to 6 minutes for K8s LoadBalancer
262
262
k8s_get_wait_interval : 10 ,
263
+ python_binary : ' $WORKSPACE/.beam_env/bin/python' ,
263
264
temp_dir : ' $WORKSPACE' ,
264
265
// Use source cloned by Jenkins and not clone it second time (redundantly).
265
266
beam_location : ' $WORKSPACE/src' ,
@@ -304,25 +305,28 @@ class CommonJobProperties {
304
305
context. steps {
305
306
// Clean up environment.
306
307
shell(' rm -rf PerfKitBenchmarker' )
307
- shell(' rm -rf .env' )
308
+ shell(' rm -rf .beam_env' )
309
+ shell(' rm -rf .perfkit_env' )
308
310
309
311
// create new VirtualEnv, inherit already existing packages
310
- shell(' virtualenv .env --system-site-packages' )
312
+ shell(' virtualenv .beam_env --system-site-packages' )
313
+ shell(' virtualenv .perfkit_env --system-site-packages' )
311
314
312
315
// update setuptools and pip
313
- shell(' .env/bin/pip install --upgrade setuptools pip' )
316
+ shell(' .beam_env/bin/pip install --upgrade setuptools pip' )
317
+ shell(' .perfkit_env/bin/pip install --upgrade setuptools pip' )
314
318
315
319
// Clone appropriate perfkit branch
316
320
shell(' git clone https://github.com/GoogleCloudPlatform/PerfKitBenchmarker.git' )
317
321
318
322
// Install job requirements for Python SDK.
319
- shell(' .env /bin/pip install -e ' + CommonJobProperties . checkoutDir + ' /sdks/python/[gcp,test]' )
323
+ shell(' .beam_env /bin/pip install -e ' + CommonJobProperties . checkoutDir + ' /sdks/python/[gcp,test]' )
320
324
321
325
// Install Perfkit benchmark requirements.
322
- shell(' .env /bin/pip install -r PerfKitBenchmarker/requirements.txt' )
326
+ shell(' .perfkit_env /bin/pip install -r PerfKitBenchmarker/requirements.txt' )
323
327
324
328
// Launch performance test.
325
- shell(" .env /bin/python PerfKitBenchmarker/pkb.py $pkbArgs " )
329
+ shell(" .perfkit_env /bin/python PerfKitBenchmarker/pkb.py $pkbArgs " )
326
330
}
327
331
}
328
332
0 commit comments