jenkins-bot has submitted this change and it was merged.
Change subject: Normalize exit codes
......................................................................
Normalize exit codes
Change-Id: I6422ac33de07d8ed0f948964f118e0fc4a0d14a0
---
M scripts/webservice
M toollabs/webservice/backends/kubernetesbackend.py
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/webservice b/scripts/webservice
index 9ec1e0e..9b31d9a 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -38,6 +38,7 @@
job.request_stop()
wait_for(lambda: not job.get_state() == Backend.STATE_STOPPED, message)
+
def update_manifest(job, action):
"""
Update a tool's service manifest to indicate this type of webservice is
being used
@@ -76,7 +77,7 @@
print(' webservice --backend=%s stop' %
tool.manifest['backend'])
print('And then start it again with backend %s by issuing:' %
args.backend)
print(' webservice --backend=%s start' % args.backend)
- sys.exit(-1)
+ sys.exit(1)
backend = args.backend
if backend == 'gridengine':
@@ -103,7 +104,6 @@
args.type = tool.manifest.get('web', 'php5.6')
acceptable_types = KubernetesBackend.CONFIG.keys()
-
if args.type not in acceptable_types:
print("type must be one of ", ','.join(acceptable_types))
sys.exit(1)
@@ -118,7 +118,7 @@
if args.action == 'start':
if job.get_state() != Backend.STATE_STOPPED:
print('Your job is already running')
- sys.exit()
+ sys.exit(1)
start(job, 'Starting webservice')
update_manifest(job, 'start')
@@ -146,6 +146,6 @@
elif args.action == 'shell':
if backend != 'kubernetes':
print('webservice shell only supported for kubernetes backend')
- sys.exit()
+ sys.exit(1)
job.shell()
print() # End program with newline, don't output newline anywhere else :)
diff --git a/toollabs/webservice/backends/kubernetesbackend.py
b/toollabs/webservice/backends/kubernetesbackend.py
index 8dcbbbc..4cef4ff 100644
--- a/toollabs/webservice/backends/kubernetesbackend.py
+++ b/toollabs/webservice/backends/kubernetesbackend.py
@@ -277,7 +277,7 @@
time.sleep(1)
else:
print("Pod creation failed, please report this as a bug!")
- sys.exit()
+ sys.exit(1)
kubectl = subprocess.Popen([
'/usr/local/bin/kubectl',
'attach',
--
To view, visit https://gerrit.wikimedia.org/r/298347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6422ac33de07d8ed0f948964f118e0fc4a0d14a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
