Skip to content

Commit 6829086

Browse files
weskubo-cgipallvigrover
authored andcommitted
OFMCC-6453 - Add input tag to workflows (#255)
* Added tag as input. * Added step to include inputs in summary. * Updated qa(test), uat, prod. * Removed commented out command.
1 parent f211958 commit 6829086

File tree

4 files changed

+33
-27
lines changed

4 files changed

+33
-27
lines changed

.github/workflows/deploy-to-openshift-efx.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ env:
4040

4141
on:
4242
workflow_dispatch:
43+
inputs:
44+
tag:
45+
description: 'The image tag to deploy'
46+
required: true
47+
type: string
4348

4449
jobs:
4550
openshift-ci-cd:
@@ -52,6 +57,11 @@ jobs:
5257
SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
5358

5459
steps:
60+
- name: Print Workflow Dispatch Inputs and Env Vars
61+
uses: shayki5/print-workflow-dispatch-inputs@v1
62+
with:
63+
add_to_summary: 'true'
64+
print_env_vars: 'false'
5565
- name: Check for required secrets
5666
uses: actions/github-script@v6
5767
with:
@@ -95,10 +105,6 @@ jobs:
95105
with:
96106
ref: ${{ env.BRANCH }}
97107

98-
- name: Get latest tag
99-
uses: actions-ecosystem/action-get-latest-tag@v1
100-
id: get-latest-tag
101-
102108
- name: Install oc
103109
uses: redhat-actions/openshift-tools-installer@v1
104110
with:
@@ -117,8 +123,8 @@ jobs:
117123
# Create the image stream if it doesn't exist
118124
oc create imagestream ${{ env.IMAGE_NAME }} 2> /dev/null || true && echo "D365 API image stream in place"
119125
120-
# Create tag for UAT env from DEV env image
121-
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }}
126+
# Create tag for EFX env from DEV env image
127+
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
122128
123129
# Process and apply deployment template
124130
oc process \
@@ -127,7 +133,7 @@ jobs:
127133
-p REPO_NAME=${{ env.REPO_NAME }} \
128134
-p BRANCH=${{ env.BRANCH }} \
129135
-p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} \
130-
-p TAG=${{ steps.get-latest-tag.outputs.tag }} \
136+
-p TAG=${{ inputs.tag }} \
131137
-p MIN_REPLICAS=${{ env.MIN_REPLICAS }} \
132138
-p MAX_REPLICAS=${{ env.MAX_REPLICAS }} \
133139
-p MIN_CPU=${{ env.MIN_CPU }} \

.github/workflows/deploy-to-openshift-prod.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ env:
4040

4141
on:
4242
workflow_dispatch:
43+
inputs:
44+
tag:
45+
description: 'The image tag to deploy'
46+
required: true
47+
type: string
4348

4449
jobs:
4550
openshift-ci-cd:
@@ -95,10 +100,6 @@ jobs:
95100
with:
96101
ref: ${{ env.BRANCH }}
97102

98-
- name: Get latest tag
99-
uses: actions-ecosystem/action-get-latest-tag@v1
100-
id: get-latest-tag
101-
102103
- name: Install oc
103104
uses: redhat-actions/openshift-tools-installer@v1
104105
with:
@@ -118,7 +119,7 @@ jobs:
118119
oc create imagestream ${{ env.IMAGE_NAME }} 2> /dev/null || true && echo "D365 API image stream in place"
119120
120121
# Create tag for PROD env from DEV env image
121-
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }} ${{ env.NAMESPACE }}-prod/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }}
122+
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-prod/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
122123
123124
# Process and apply deployment template
124125
oc process \
@@ -127,7 +128,7 @@ jobs:
127128
-p REPO_NAME=${{ env.REPO_NAME }} \
128129
-p BRANCH=${{ env.BRANCH }} \
129130
-p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} \
130-
-p TAG=${{ steps.get-latest-tag.outputs.tag }} \
131+
-p TAG=${{ inputs.tag }} \
131132
-p MIN_REPLICAS=${{ env.MIN_REPLICAS }} \
132133
-p MAX_REPLICAS=${{ env.MAX_REPLICAS }} \
133134
-p MIN_CPU=${{ env.MIN_CPU }} \

.github/workflows/deploy-to-openshift-test.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ env:
3939

4040
on:
4141
workflow_dispatch:
42+
inputs:
43+
tag:
44+
description: 'The image tag to deploy'
45+
required: true
46+
type: string
4247

4348
jobs:
4449
openshift-ci-cd:
@@ -94,10 +99,6 @@ jobs:
9499
with:
95100
ref: ${{ env.BRANCH }}
96101

97-
- name: Get latest tag
98-
uses: actions-ecosystem/action-get-latest-tag@v1
99-
id: get-latest-tag
100-
101102
- name: Install oc
102103
uses: redhat-actions/openshift-tools-installer@v1
103104
with:
@@ -113,17 +114,14 @@ jobs:
113114
oc rollout cancel dc/${{ env.APP_NAME }}-${{ env.APP_NAME_BACKEND }} 2> /dev/null \
114115
|| true && echo "No rollout in progress"
115116
116-
# Create tag for TEST env from DEV env image
117-
# oc tag ${{ env.NAMESPACE }}-dev/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }}:${{ steps.get-latest-tag.outputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.REPO_NAME }}-${{ env.APP_NAME_BACKEND }}-${{ env.BRANCH }}:${{ steps.get-latest-tag.outputs.tag }}
118-
119117
# Process and apply deployment template
120118
oc process \
121119
-f tools/openshift/d365api.dc.yaml \
122120
-p APP_NAME=${{ env.APP_NAME }} \
123121
-p REPO_NAME=${{ env.REPO_NAME }} \
124122
-p BRANCH=${{ env.BRANCH }} \
125123
-p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} \
126-
-p TAG=${{ steps.get-latest-tag.outputs.tag }} \
124+
-p TAG=${{ inputs.tag }} \
127125
-p MIN_REPLICAS=${{ env.MIN_REPLICAS }} \
128126
-p MAX_REPLICAS=${{ env.MAX_REPLICAS }} \
129127
-p MIN_CPU=${{ env.MIN_CPU }} \

.github/workflows/deploy-to-openshift-uat.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ env:
4040

4141
on:
4242
workflow_dispatch:
43+
inputs:
44+
tag:
45+
description: 'The image tag to deploy'
46+
required: true
47+
type: string
4348

4449
jobs:
4550
openshift-ci-cd:
@@ -95,10 +100,6 @@ jobs:
95100
with:
96101
ref: ${{ env.BRANCH }}
97102

98-
- name: Get latest tag
99-
uses: actions-ecosystem/action-get-latest-tag@v1
100-
id: get-latest-tag
101-
102103
- name: Install oc
103104
uses: redhat-actions/openshift-tools-installer@v1
104105
with:
@@ -118,7 +119,7 @@ jobs:
118119
oc create imagestream ${{ env.IMAGE_NAME }} 2> /dev/null || true && echo "D365 API image stream in place"
119120
120121
# Create tag for UAT env from DEV env image
121-
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ steps.get-latest-tag.outputs.tag }}
122+
oc tag ${{ env.NAMESPACE }}-dev/${{ env.IMAGE_NAME }}:${{ inputs.tag }} ${{ env.NAMESPACE }}-test/${{ env.IMAGE_NAME }}:${{ inputs.tag }}
122123
123124
# Process and apply deployment template
124125
oc process \
@@ -127,7 +128,7 @@ jobs:
127128
-p REPO_NAME=${{ env.REPO_NAME }} \
128129
-p BRANCH=${{ env.BRANCH }} \
129130
-p NAMESPACE=${{ env.OPENSHIFT_NAMESPACE }} \
130-
-p TAG=${{ steps.get-latest-tag.outputs.tag }} \
131+
-p TAG=${{ inputs.tag }} \
131132
-p MIN_REPLICAS=${{ env.MIN_REPLICAS }} \
132133
-p MAX_REPLICAS=${{ env.MAX_REPLICAS }} \
133134
-p MIN_CPU=${{ env.MIN_CPU }} \

0 commit comments

Comments
 (0)