Minor fixes in cls_containerize.py
This commit is contained in:
committed by
Robert Schmidt
parent
5c426db6eb
commit
98f06c5907
@@ -383,7 +383,7 @@ class Containerize():
|
|||||||
|
|
||||||
CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
|
CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
|
||||||
|
|
||||||
# if asterix, copy the entitlement and subscription manager configurations
|
# if asterix, copy the entitlement and subscription manager configurations
|
||||||
if self.host == 'Red Hat':
|
if self.host == 'Red Hat':
|
||||||
cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
|
cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
|
||||||
cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
|
cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
|
||||||
@@ -981,7 +981,7 @@ class Containerize():
|
|||||||
for s in allServices:
|
for s in allServices:
|
||||||
mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
|
mySSH.command(f'docker-compose -f ci-docker-compose.yml ps --all -- {s}', '\$', 5, silent=False)
|
||||||
running = mySSH.getBefore().split('\r\n')[2:-1]
|
running = mySSH.getBefore().split('\r\n')[2:-1]
|
||||||
#logging.debug(f'running services: {running}')
|
logging.debug(f'running services: {running}')
|
||||||
if len(running) > 0: # something is running for that service
|
if len(running) > 0: # something is running for that service
|
||||||
services.append(s)
|
services.append(s)
|
||||||
logging.info(f'stopping services {services}')
|
logging.info(f'stopping services {services}')
|
||||||
|
|||||||
Reference in New Issue
Block a user