Merge pull request #30775 from dims/cleanup-bootstrap-and-kubernetes-…

…e2e-scripts Cleanup bootstrap and kubernetes e2e scripts
kubernetes · Sep 21, 2023 · 6177d94 · 6177d94
2 parents 293bdb8 + 06bb395
commit 6177d94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 338 deletions.
diff --git a/jenkins/bootstrap.py b/jenkins/bootstrap.py
@@ -43,10 +43,10 @@
 import json
 import logging
 import os
-import pipes
 import random
 import re
 import select
+import shlex
 import signal
 import socket
 import subprocess
@@ -1066,7 +1066,7 @@ def bootstrap(args):
     )
 
     if len(sys.argv) > 1:
-        logging.info('Args: %s', ' '.join(pipes.quote(a)
+        logging.info('Args: %s', ' '.join(shlex.quote(a)
                                           for a in sys.argv[1:]))
     logging.info('Bootstrap %s...', job)
     logging.info('Builder: %s', node())