Fix for files without extention
Change-Id: I51cf46f93495d0f54732e4f6927bc46336888052
Related-prod: PROD-31274
diff --git a/save_jenkins_console/save_jenkins_console/config.py b/save_jenkins_console/save_jenkins_console/config.py
index 73f8ba5..b0f6cb9 100755
--- a/save_jenkins_console/save_jenkins_console/config.py
+++ b/save_jenkins_console/save_jenkins_console/config.py
@@ -5,7 +5,8 @@
# Jenkins jobs names for https://ci.mcp.mirantis.net
# For example https://ci.mcp.mirantis.net/oscore-tempest-runner
-JOBS_FOR_GETTING_LOGS_FROM_OUTPUT = ['oscore-tempest-runner',
+JOBS_FOR_GETTING_LOGS_FROM_OUTPUT = [
+ 'oscore-tempest-runner',
'oscore-oscc-ci',
'oscore-test-cookiecutter-model',
'rollout-mcp-env',
diff --git a/save_jenkins_console/save_jenkins_console/jenkins_api.py b/save_jenkins_console/save_jenkins_console/jenkins_api.py
index e595df5..dced5e8 100755
--- a/save_jenkins_console/save_jenkins_console/jenkins_api.py
+++ b/save_jenkins_console/save_jenkins_console/jenkins_api.py
@@ -71,8 +71,8 @@
job_name=self.pipeline_job_name)
saved_artifact_file_patch = build_artfact.save_to_dir(
patch_to_artifact_file)
- # rename saved file
+ # rename saved file
new_artifact_file_patch = utils.generate_artifact_file_patch(
saved_artifact_file_patch=saved_artifact_file_patch,
patch_to_artifact_file=patch_to_artifact_file,
@@ -83,8 +83,7 @@
new_artifact_filename = utils.rename_artifact_file(
old_artifact_file_patch=saved_artifact_file_patch,
new_artifact_file_patch=new_artifact_file_patch)
- logger.info(
- f'new_artifact_filename: {new_artifact_filename}')
+ logger.info(f'new_artifact_filename: {new_artifact_filename}')
if utils.check_if_file_exists(patch_to_file=saved_artifact_file_patch):
os.remove(saved_artifact_file_patch)
diff --git a/save_jenkins_console/save_jenkins_console/utils.py b/save_jenkins_console/save_jenkins_console/utils.py
index 1f3ac90..4a97455 100755
--- a/save_jenkins_console/save_jenkins_console/utils.py
+++ b/save_jenkins_console/save_jenkins_console/utils.py
@@ -183,12 +183,20 @@
pipeline_job_name,
build_id,
build_date):
- artifact_extention = saved_artifact_file_patch.split('.')[-1]
- filename = f'{str(build_id)}_{build_date}_{pipeline_job_name}.{artifact_extention}'
- full_patch = patch_to_artifact_file + filename
+ if 'kubeconfig' in saved_artifact_file_patch:
+ artifact_extention = 'txt'
+ artifact_filename = saved_artifact_file_patch.split('/')[-1]
+ filename = f'{str(build_id)}_{build_date}_{pipeline_job_name}_{artifact_filename}.{artifact_extention}'
+ full_patch = patch_to_artifact_file + filename
+ else:
+ artifact_extention = saved_artifact_file_patch.split('.')[-1]
+ filename = f'{str(build_id)}_{build_date}_{pipeline_job_name}.{artifact_extention}'
+ full_patch = patch_to_artifact_file + filename
+ logger.info(f'Full file patch: {full_patch}')
return full_patch
def rename_artifact_file(old_artifact_file_patch, new_artifact_file_patch):
os.rename(old_artifact_file_patch, new_artifact_file_patch)
return new_artifact_file_patch
+