From c5401be4ea9c27af492a08faa60f199fc46f33f3 Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Mon, 1 Aug 2022 15:11:50 +0300 Subject: [PATCH 1/2] add support for CF_RUNTIME_NAME --- incubating/codefresh-report-image/step.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 562a413db..7cba2f141 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -29,7 +29,7 @@ metadata: arguments: CF_API_KEY: codefresh-cd-api-token CF_IMAGE: docker.io/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}:${{CF_REVISION}} - CF_HOST: https://codefresh.mydomain.com + CF_RUNTIME_NAME: codefresh-hosted - description: report-image-metadata-all workflow: ReportImageMetadataAll: @@ -39,7 +39,7 @@ metadata: arguments: CF_API_KEY: codefresh-cd-api-token CF_IMAGE: docker.io/${{CF_REPO_OWNER}}/${{CF_REPO_NAME}}:${{CF_REVISION}} - CF_HOST: https://codefresh.mydomain.com + CF_RUNTIME_NAME: codefresh-hosted CF_ENRICHERS: ${{CF_ENRICHERS}} CF_GITHUB_TOKEN: ${{GITHUB_TOKEN}} CF_GIT_PROVIDER: github @@ -60,8 +60,7 @@ spec: "patterns": [], "required": [ "CF_API_KEY", - "CF_IMAGE", - "CF_HOST" + "CF_IMAGE" ], "properties": { "CF_API_KEY": { @@ -109,6 +108,10 @@ spec: "type": "string", "description": "Codefresh Runtime Ingress URL. (ie. https://codefresh.mycompany.com)" }, + "CF_RUNTIME_NAME": { + "type": "string", + "description": "Name of runtime to implement the enrichment" + }, "CF_JIRA_API_TOKEN": { "type": "string", "description": "When no jira integration is specified: Jira token for authenticating." @@ -186,6 +189,7 @@ spec: environment: - CF_CI_TYPE=classic - CF_WORKFLOW_URL=${{CF_BUILD_URL}} + - CF_WORKFLOW_NAME=${{CF_REPO_OWNER}}/${{CF_PIPELINE_NAME}} [[ range $key, $val := .Arguments ]] - '[[ $key ]]=[[ $val ]]' [[- end ]] From d6bd0375f45cfc133db56733fa05c71e7dd5a04b Mon Sep 17 00:00:00 2001 From: eti-codefresh Date: Wed, 3 Aug 2022 17:26:26 +0300 Subject: [PATCH 2/2] add support for CF_RUNTIME_NAME --- incubating/codefresh-report-image/step.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/incubating/codefresh-report-image/step.yaml b/incubating/codefresh-report-image/step.yaml index 7cba2f141..d34c75c84 100644 --- a/incubating/codefresh-report-image/step.yaml +++ b/incubating/codefresh-report-image/step.yaml @@ -2,7 +2,7 @@ kind: step-type version: '1.0' metadata: name: codefresh-report-image - version: 1.0.2 + version: 1.0.3 isPublic: true description: Report Docker Image Metadata to Codefresh CD sources: @@ -189,7 +189,7 @@ spec: environment: - CF_CI_TYPE=classic - CF_WORKFLOW_URL=${{CF_BUILD_URL}} - - CF_WORKFLOW_NAME=${{CF_REPO_OWNER}}/${{CF_PIPELINE_NAME}} + - CF_WORKFLOW_NAME=${{CF_PIPELINE_NAME}} [[ range $key, $val := .Arguments ]] - '[[ $key ]]=[[ $val ]]' [[- end ]]