Skip to content

Commit 2fa86a2

Browse files
anthony-nhsanthony-nhs
authored
Chore: [AEA-0000] - remove pushing cdk image (#649)
## Summary - Routine Change ### Details - remove pushing cdk image
1 parent d53c451 commit 2fa86a2

8 files changed

Lines changed: 16 additions & 454 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,21 @@ env:
88
BRANCH_NAME: ${{ github.ref_name }}
99

1010
jobs:
11-
get_commit_id:
12-
runs-on: ubuntu-22.04
13-
outputs:
14-
commit_id: ${{ steps.commit_id.outputs.commit_id }}
15-
sha_short: ${{ steps.commit_id.outputs.sha_short }}
16-
17-
steps:
18-
- name: Checkout code
19-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
20-
with:
21-
ref: ${{ env.BRANCH_NAME }}
22-
23-
- name: Get Commit ID
24-
id: commit_id
25-
run: |
26-
# echo "commit_id=${{ github.sha }}" >> "$GITHUB_ENV"
27-
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
28-
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
2911
get_config_values:
3012
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@b0172dbdb3af4ae232873106553c316d79d784fc
3113
with:
3214
verify_published_from_main_image: true
3315
quality_checks:
3416
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@352f15f692c23b18f67215ad858f27b06a878717
35-
needs: [get_config_values, get_commit_id]
17+
needs: [get_config_values]
3618
with:
3719
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
38-
run_docker_scan: true
39-
docker_images: "eps-cdk-utils"
20+
run_docker_scan: false
4021
secrets:
4122
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4223

4324
tag_release:
44-
needs: [quality_checks, get_commit_id, get_config_values]
25+
needs: [quality_checks, get_config_values]
4526
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@352f15f692c23b18f67215ad858f27b06a878717
4627
with:
4728
dry_run: true
@@ -51,57 +32,8 @@ jobs:
5132
tag_format: ${{ needs.get_config_values.outputs.tag_format }}
5233
secrets: inherit
5334

54-
package_code:
55-
needs: [tag_release, quality_checks, get_commit_id, get_config_values]
56-
uses: ./.github/workflows/docker_image_build.yml
57-
with:
58-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
59-
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
60-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
61-
62-
release_dev:
63-
needs: [tag_release, package_code, get_commit_id, get_config_values]
64-
uses: ./.github/workflows/docker_image_upload.yml
65-
with:
66-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
67-
AWS_ENVIRONMENT: dev
68-
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
69-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
70-
TAG_LATEST: false
71-
DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
72-
secrets:
73-
CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}
74-
75-
release_qa:
76-
needs:
77-
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
78-
uses: ./.github/workflows/docker_image_upload.yml
79-
with:
80-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
81-
AWS_ENVIRONMENT: qa
82-
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
83-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
84-
TAG_LATEST: false
85-
DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
86-
secrets:
87-
CDK_PUSH_IMAGE_ROLE: ${{ secrets.QA_CDK_PUSH_IMAGE_ROLE }}
88-
89-
release_ref:
90-
needs:
91-
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
92-
uses: ./.github/workflows/docker_image_upload.yml
93-
with:
94-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
95-
AWS_ENVIRONMENT: ref
96-
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
97-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
98-
TAG_LATEST: false
99-
DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
100-
secrets:
101-
CDK_PUSH_IMAGE_ROLE: ${{ secrets.REF_CDK_PUSH_IMAGE_ROLE }}
102-
10335
package_npm_code:
104-
needs: [quality_checks, get_commit_id, get_config_values]
36+
needs: [quality_checks, get_config_values]
10537
uses: ./.github/workflows/package_npm_code.yml
10638
with:
10739
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/docker_image_build.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎.github/workflows/docker_image_upload.yml‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎.github/workflows/pull_request.yml‎

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ jobs:
2222
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b0172dbdb3af4ae232873106553c316d79d784fc
2323
quality_checks:
2424
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@352f15f692c23b18f67215ad858f27b06a878717
25-
needs: [get_config_values, get_commit_id]
25+
needs: [get_config_values]
2626
with:
2727
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
28-
run_docker_scan: true
29-
docker_images: "eps-cdk-utils"
28+
run_docker_scan: false
3029

3130
secrets:
3231
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -57,53 +56,15 @@ jobs:
5756
}
5857
result-encoding: string
5958

60-
get_commit_id:
61-
runs-on: ubuntu-22.04
62-
outputs:
63-
commit_id: ${{ steps.commit_id.outputs.commit_id }}
64-
sha_short: ${{ steps.commit_id.outputs.sha_short }}
65-
steps:
66-
- name: Checkout code
67-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
68-
with:
69-
ref: ${{ env.BRANCH_NAME }}
70-
71-
- name: Get Commit ID
72-
id: commit_id
73-
run: |
74-
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
75-
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
76-
77-
package_docker_image:
78-
needs: [get_issue_number, quality_checks, get_commit_id, get_config_values]
79-
uses: ./.github/workflows/docker_image_build.yml
80-
with:
81-
VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
82-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
83-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
8459

8560
package_npm_code:
86-
needs: [quality_checks, get_commit_id, get_config_values]
61+
needs: [quality_checks, get_config_values]
8762
uses: ./.github/workflows/package_npm_code.yml
8863
with:
8964
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
9065

91-
release_docker_image:
92-
needs:
93-
[get_issue_number, package_docker_image, get_commit_id, get_config_values]
94-
uses: ./.github/workflows/docker_image_upload.yml
95-
with:
96-
AWS_ENVIRONMENT: dev
97-
VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
98-
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
99-
TAG_LATEST: false
100-
DOCKER_IMAGE_TAG: PR-${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}
101-
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
102-
secrets:
103-
CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}
104-
10566
tag_release:
106-
needs: [get_commit_id, get_config_values]
67+
needs: [get_config_values]
10768
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@352f15f692c23b18f67215ad858f27b06a878717
10869
with:
10970
dry_run: true

0 commit comments

Comments
 (0)