From 3a3a3efcd916a45ad8507081e9ff2a225bbc31a4 Mon Sep 17 00:00:00 2001 From: Mohammed Ismail Date: Mon, 12 Apr 2021 12:45:39 +0200 Subject: [PATCH] CI: missing parameters added Signed-off-by: Mohammed Ismail --- ci-scripts/cls_physim1.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py index 2e81218cd4..ff3d6ed0c0 100644 --- a/ci-scripts/cls_physim1.py +++ b/ci-scripts/cls_physim1.py @@ -32,9 +32,12 @@ # Import #----------------------------------------------------------- import logging -import sshconnection +import sshconnection as SSH import html import os +import re +import time +import sys import constants as CONST import helpreadme as HELP @@ -98,6 +101,7 @@ class PhySim: mySSH.command("sudo podman image inspect --format='Size = {{.Size}} bytes' oai-physim:ci-temp", '\$', 60) if mySSH.getBefore().count('no such image') != 0: logging.error('\u001B[1m No such image oai-physim\u001B[0m') + sys.exit(-1) else: result = re.search('Size *= *(?P[0-9\-]+) *bytes', mySSH.getBefore()) if result is not None: @@ -117,13 +121,15 @@ class PhySim: # logging to OC cluster mySSH.command('oc login -u {self.OCUserName} -p {self.OCPassword}', '\$', 6) - if mySSH.getBefore().count('Login successful') == 0: + if mySSH.getBefore().count('Login successful.') == 0: logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m') + sys.exit(-1) else: logging.debug('\u001B[1m Login to OC Cluster Successfully\u001B[0m') mySSH.command('oc project {self.OCWorkspace}', '\$', 6) if (mySSH.getBefore().count('Already on project "{self.OCWorkspace}"')) == 0 or (mySSH.getBefore().count('Now using project "{self.OCWorkspace}"')) == 0: logging.error('\u001B[1m Unable to access OC project {self.OCWorkspace}\u001B[0m') + sys.exit(-1) else: logging.debug('\u001B[1m Now using project {self.OCWorkspace}\u001B[0m') @@ -131,6 +137,7 @@ class PhySim: mySSH.command('helm install physim ./charts/physims/', '\$', 6) if mySSH.getBefore().count('STATUS: deployed') == 0: logging.error('\u001B[1m Deploying PhySim Failed using helm chart\u001B[0m') + sys.exit(-1) else: logging.debug('\u001B[1m Deployed PhySim Successfully using helm chart\u001B[0m') isRunning = False