Skip to content

Commit

Permalink
Ci rename variable (#13)
Browse files Browse the repository at this point in the history
* In CI workflows rename ARTIFACT_NAME to IMAGE_NAME

* In CI workflows remove unneeded quotes
  • Loading branch information
JonJagger committed Dec 2, 2023
1 parent 2b8fa1d commit d86de66
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ jobs:
- name: Report image to Kosli flow
run: |
IMAGE_TAG="$(echo $GITHUB_SHA | head -c7)"
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${IMAGE_TAG}
docker pull ${ARTIFACT_NAME}
kosli report artifact ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${IMAGE_TAG}
docker pull ${IMAGE_NAME}
kosli report artifact ${IMAGE_NAME} \
--artifact-type=docker
test:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sub_approve_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ jobs:

- name: Report approval of deployment
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${ARTIFACT_NAME}
kosli report approval ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${IMAGE_NAME}
kosli report approval ${IMAGE_NAME} \
--artifact-type=docker \
--environment=${{ inputs.KOSLI_ENVIRONMENT }} \
--approver="${{ github.actor }}"
- name: Report expected deployment to Kosli
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${ARTIFACT_NAME}
kosli expect deployment ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${IMAGE_NAME}
kosli expect deployment ${IMAGE_NAME} \
--artifact-type=docker \
--description="Deployed to ${{ inputs.KOSLI_ENVIRONMENT }} in Github Actions pipeline" \
--environment=${{ inputs.KOSLI_ENVIRONMENT }}
4 changes: 2 additions & 2 deletions .github/workflows/sub_build_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:

- name: Report image to Kosli flow
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
kosli report artifact ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
kosli report artifact ${IMAGE_NAME} \
--artifact-type=docker
6 changes: 3 additions & 3 deletions .github/workflows/sub_sdlc_gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Kosli SDLC gate to short-circuit-the-flow
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${ARTIFACT_NAME}
kosli assert artifact ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${IMAGE_NAME}
kosli assert artifact ${IMAGE_NAME} \
--artifact-type=docker
16 changes: 8 additions & 8 deletions .github/workflows/sub_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ jobs:

- name: Report Snyk results to Kosli flow
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${ARTIFACT_NAME}
kosli report evidence artifact snyk ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${IMAGE_NAME}
kosli report evidence artifact snyk ${IMAGE_NAME} \
--artifact-type=docker \
--name=snyk-scan \
--scan-results=snyk.json
Expand Down Expand Up @@ -98,9 +98,9 @@ jobs:
cp "$(repo_root)/.rubocop.yml" "${LINT_EVIDENCE_DIR}"/.rubocop.yml
gem install rubocop
if [ rubocop "$(repo_root)" | tee "${LINT_EVIDENCE_DIR}"/rubocop.log ]; then
export KOSLI_LINT_COMPLIANT='true'
export KOSLI_LINT_COMPLIANT=true
else
export KOSLI_LINT_COMPLIANT='false'
export KOSLI_LINT_COMPLIANT=false
fi
kosli report evidence commit generic \
Expand All @@ -125,9 +125,9 @@ jobs:

- name: Report pull-request evidence to Kosli
run: |
ARTIFACT_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${ARTIFACT_NAME}
kosli report evidence artifact pullrequest github ${ARTIFACT_NAME} \
IMAGE_NAME=cyberdojo/${{ env.KOSLI_FLOW }}:${{ inputs.IMAGE_TAG }}
docker pull ${IMAGE_NAME}
kosli report evidence artifact pullrequest github ${IMAGE_NAME} \
--artifact-type=docker \
--github-token ${{ secrets.GITHUB_TOKEN }} \
--name=pull-request

0 comments on commit d86de66

Please sign in to comment.