From 6e708cca4ea919536e4c10992b12d75d74be2993 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Tue, 27 Aug 2024 13:04:35 +0930 Subject: [PATCH 1/9] add max_upload_size_mb for test-reporting step --- incubating/test-reporting/step.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index fdc29462f..e5dbb61b1 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -45,6 +45,7 @@ metadata: branch: ${{CF_BRANCH_TAG_NORMALIZED}} report_dir: mochawesome-report report_index_file: mochawesome.html + max_upload_size_mb: 1000 spec: arguments: |- @@ -113,6 +114,9 @@ spec: [[ end ]] [[ if .Arguments.storage_integration ]] - CF_STORAGE_INTEGRATION=[[ .Arguments.storage_integration ]] + [[ end ]] + [[ if .Arguments.max_upload_size_mb ]] + - MAX_UPLOAD_SIZE_MB=[[ .Arguments.max_upload_size_mb ]] [[ end ]] - CF_STEP_NAME=first - CF_VOLUME_PATH=/meta From 5188b02e2ee3bbce2305d6973ae81b9adc42d605 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Wed, 28 Aug 2024 16:26:15 +0930 Subject: [PATCH 2/9] update version --- incubating/test-reporting/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index e5dbb61b1..37d13cd1d 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -2,7 +2,7 @@ kind: step-type version: '1.0' metadata: name: test-reporting - version: 1.1.4 + version: 1.2.0 title: Test reporting isPublic: true description: Upload test report to some your storage integration. From 80834ddb075237e754e831735bed81da5bf943de Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Wed, 28 Aug 2024 16:26:39 +0930 Subject: [PATCH 3/9] add missing argument definition --- incubating/test-reporting/step.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 37d13cd1d..bc53498f6 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -45,7 +45,6 @@ metadata: branch: ${{CF_BRANCH_TAG_NORMALIZED}} report_dir: mochawesome-report report_index_file: mochawesome.html - max_upload_size_mb: 1000 spec: arguments: |- @@ -85,8 +84,11 @@ spec: "branch" : { "type": "string", "description": "Normalized branch name" + }, + "max_upload_size_mb": { + "type": "integer", + "description": "Max upload size in MB. The default is 1000MB" } - } } stepsTemplate: |- From c9786b611da5ec67386a4e86309e6d9791dd432f Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Wed, 28 Aug 2024 16:26:55 +0930 Subject: [PATCH 4/9] update tag to new version --- incubating/test-reporting/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index bc53498f6..002f08a67 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -94,7 +94,7 @@ spec: stepsTemplate: |- first: title: Generate test reporting - image: codefresh/cf-docker-test-reporting:test-report-link + image: codefresh/cf-docker-test-reporting:scmecr-19339add-max-file-upload-argument environment: [[ if .Arguments.allure_dir ]] - ALLURE_DIR=[[ .Arguments.allure_dir ]] From 07484cce3cfc0a0586a32d96e3bc0bd164fe6ccb Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Fri, 30 Aug 2024 14:52:49 +0930 Subject: [PATCH 5/9] add missing arguments --- incubating/test-reporting/step.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 002f08a67..925ef2f18 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -77,6 +77,10 @@ spec: "type": "string", "description": "Directory with test report files" }, + "report_path": { + "type": "string", + "description": "Path where the report files are saved in the bucket" + }, "report_index_file": { "type": "string", "description": "Root file that will be open in report" @@ -88,6 +92,10 @@ spec: "max_upload_size_mb": { "type": "integer", "description": "Max upload size in MB. The default is 1000MB" + }, + "cf_api_retries": { + "type": "integer", + "description": "The number of times to retry if a Codefresh API call fails. The default is 0" } } } @@ -108,6 +116,9 @@ spec: [[ if .Arguments.report_dir ]] - REPORT_DIR=[[ .Arguments.report_dir ]] [[ end ]] + [[ if .Arguments.report_path ]] + - REPORT_PATH=[[ .Arguments.report_path ]] + [[ end ]] [[ if .Arguments.report_index_file ]] - REPORT_INDEX_FILE=[[ .Arguments.report_index_file ]] [[ end ]] @@ -119,6 +130,9 @@ spec: [[ end ]] [[ if .Arguments.max_upload_size_mb ]] - MAX_UPLOAD_SIZE_MB=[[ .Arguments.max_upload_size_mb ]] + [[ end ]] + [[ if .Arguments.cf_api_retries ]] + - CF_API_RETRIES=[[ .Arguments.cf_api_retries ]] [[ end ]] - CF_STEP_NAME=first - CF_VOLUME_PATH=/meta From 94419f7d9e7b5e2c7a14048561a02e5f1c6ad8fa Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Fri, 30 Aug 2024 14:54:02 +0930 Subject: [PATCH 6/9] update image tag to latest pre-release tag --- incubating/test-reporting/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 925ef2f18..31fe0b224 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -102,7 +102,7 @@ spec: stepsTemplate: |- first: title: Generate test reporting - image: codefresh/cf-docker-test-reporting:scmecr-19339add-max-file-upload-argument + image: codefresh/cf-docker-test-reporting:1.2.0-scmecr-19339add-max-file-upload-argument environment: [[ if .Arguments.allure_dir ]] - ALLURE_DIR=[[ .Arguments.allure_dir ]] From 12af6c9b5e4c3cbcbfcf2b3e49ed1bfea1c7b828 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Tue, 3 Sep 2024 19:57:40 +0930 Subject: [PATCH 7/9] add image tag to step --- incubating/test-reporting/step.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 31fe0b224..78873c5c8 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -45,6 +45,7 @@ metadata: branch: ${{CF_BRANCH_TAG_NORMALIZED}} report_dir: mochawesome-report report_index_file: mochawesome.html + image_tag: 1.2.0-scmecr-19339add-max-file-upload-argument spec: arguments: |- @@ -96,13 +97,17 @@ spec: "cf_api_retries": { "type": "integer", "description": "The number of times to retry if a Codefresh API call fails. The default is 0" + }, + "image_tag": { + "type": "string", + "description": "The version of test reporting image. The default is 1.2.0" } } } stepsTemplate: |- first: title: Generate test reporting - image: codefresh/cf-docker-test-reporting:1.2.0-scmecr-19339add-max-file-upload-argument + image: codefresh/cf-docker-test-reporting:[[ .Arguments.image_tag ]] environment: [[ if .Arguments.allure_dir ]] - ALLURE_DIR=[[ .Arguments.allure_dir ]] From 0db070be3b75453c928a8e677f67ce88f47dae33 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Thu, 5 Sep 2024 11:07:38 +0930 Subject: [PATCH 8/9] Fix bugs, defaults and descriptions in step after testing --- incubating/test-reporting/step.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 78873c5c8..44681e23a 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -5,7 +5,7 @@ metadata: version: 1.2.0 title: Test reporting isPublic: true - description: Upload test report to some your storage integration. + description: Upload test report data to your storage integration. sources: - 'https://github.com/codefresh-io/cf-docker-test-reporting' stage: incubating @@ -45,8 +45,6 @@ metadata: branch: ${{CF_BRANCH_TAG_NORMALIZED}} report_dir: mochawesome-report report_index_file: mochawesome.html - image_tag: 1.2.0-scmecr-19339add-max-file-upload-argument - spec: arguments: |- { @@ -92,15 +90,18 @@ spec: }, "max_upload_size_mb": { "type": "integer", - "description": "Max upload size in MB. The default is 1000MB" + "description": "Max upload size in MB", + "default": 1000 }, "cf_api_retries": { "type": "integer", - "description": "The number of times to retry if a Codefresh API call fails. The default is 0" + "description": "The number of times to retry if a Codefresh API call fails", + "default": 0 }, "image_tag": { "type": "string", - "description": "The version of test reporting image. The default is 1.2.0" + "description": "The version of test reporting image", + "default": "1.2.0-scmecr-19339add-max-file-upload-argument" } } } From e8e457389fc87f3764dfb37547f0e3b9dd58b169 Mon Sep 17 00:00:00 2001 From: Scott Merchant Date: Thu, 5 Sep 2024 11:35:22 +0930 Subject: [PATCH 9/9] Update to full release tag for step --- incubating/test-reporting/step.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubating/test-reporting/step.yaml b/incubating/test-reporting/step.yaml index 44681e23a..2e1eb8513 100644 --- a/incubating/test-reporting/step.yaml +++ b/incubating/test-reporting/step.yaml @@ -101,7 +101,7 @@ spec: "image_tag": { "type": "string", "description": "The version of test reporting image", - "default": "1.2.0-scmecr-19339add-max-file-upload-argument" + "default": "1.2.0" } } }