jenkins-bot has submitted this change and it was merged.
Change subject: Permit doing webservice shell for k8s with a running ge job
......................................................................
Permit doing webservice shell for k8s with a running ge job
This allows people to setup their builds while gridengine job
is still running
Change-Id: Ibadf007e45e420ffe6d8152bb0df618a9ba87bef
---
M scripts/webservice
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/webservice b/scripts/webservice
index a0e6274..bfb30c3 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -64,14 +64,13 @@
tool = Tool.from_currentuser()
-
# We use this logic rather than setting defaults in argparse.
# This allows us to default to spec in service.manifest but override
# by specifying --backend option on the CLI
if args.backend is None:
backend = tool.manifest.get('backend', 'gridengine')
else:
- if 'backend' in tool.manifest and tool.manifest['backend'] !=
args.backend:
+ if 'backend' in tool.manifest and tool.manifest['backend'] !=
args.backend and args.action != 'shell':
print('Looks like you already have another webservice running,
with a %s backend' % tool.manifest['backend'])
print('You should stop that webservice by issuing:')
print(' webservice --backend=%s stop' %
tool.manifest['backend'])
--
To view, visit https://gerrit.wikimedia.org/r/298473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibadf007e45e420ffe6d8152bb0df618a9ba87bef
Gerrit-PatchSet: 4
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
