Fix Python "invalid escape sequence" warnings
cls_containerize.py:139: SyntaxWarning: invalid escape sequence '\.'
lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
cls_containerize.py:441: SyntaxWarning: invalid escape sequence '\-'
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
cls_containerize.py:493: SyntaxWarning: invalid escape sequence '\-'
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
cls_containerize.py:616: SyntaxWarning: invalid escape sequence '\-'
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
This commit is contained in:
@@ -136,7 +136,7 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):
|
|||||||
lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
|
lineHasTag2 = re.search(f'naming to docker.io/library/{image}:', str(line)) is not None
|
||||||
tagged = tagged or lineHasTag or lineHasTag2
|
tagged = tagged or lineHasTag or lineHasTag2
|
||||||
# the OpenShift Cluster builder prepends image registry URL
|
# the OpenShift Cluster builder prepends image registry URL
|
||||||
lineHasCommit = re.search(f'COMMIT [a-zA-Z0-9\.:/\-]*{image}', str(line)) is not None
|
lineHasCommit = re.search(r'COMMIT [a-zA-Z0-9\.:/\-]*' + image, str(line)) is not None
|
||||||
committed = committed or lineHasCommit
|
committed = committed or lineHasCommit
|
||||||
errorandwarnings['errors'] = 0 if committed or tagged else 1
|
errorandwarnings['errors'] = 0 if committed or tagged else 1
|
||||||
errorandwarnings['warnings'] = 0
|
errorandwarnings['warnings'] = 0
|
||||||
@@ -441,7 +441,7 @@ class Containerize():
|
|||||||
HTML.CreateHtmlTabFooter(False)
|
HTML.CreateHtmlTabFooter(False)
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
|
result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
|
||||||
if result is not None:
|
if result is not None:
|
||||||
size = float(result.group("size")) / 1000000
|
size = float(result.group("size")) / 1000000
|
||||||
imageSizeStr = f'{size:.1f}'
|
imageSizeStr = f'{size:.1f}'
|
||||||
@@ -493,7 +493,7 @@ class Containerize():
|
|||||||
allImagesSize[name] = 'N/A -- Build Failed'
|
allImagesSize[name] = 'N/A -- Build Failed'
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
|
result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
|
||||||
if result is not None:
|
if result is not None:
|
||||||
size = float(result.group("size")) / 1000000 # convert to MB
|
size = float(result.group("size")) / 1000000 # convert to MB
|
||||||
imageSizeStr = f'{size:.1f}'
|
imageSizeStr = f'{size:.1f}'
|
||||||
@@ -616,7 +616,7 @@ class Containerize():
|
|||||||
collectInfo = {}
|
collectInfo = {}
|
||||||
collectInfo['proxy'] = files
|
collectInfo['proxy'] = files
|
||||||
ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
|
ret = ssh.run(f'docker image inspect --format=\'Size = {{{{.Size}}}} bytes\' proxy:{tag}')
|
||||||
result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
|
result = re.search(r'Size *= *(?P<size>[0-9\-]+) *bytes', ret.stdout)
|
||||||
# Cleaning any created tmp volume
|
# Cleaning any created tmp volume
|
||||||
ssh.run('docker volume prune --force')
|
ssh.run('docker volume prune --force')
|
||||||
ssh.close()
|
ssh.close()
|
||||||
|
|||||||
Reference in New Issue
Block a user