Skip to content

Commit 6a07fd3

Browse files
authored
Merge pull request #14 from datavisyn/support_customer_stages
Add support for customer stages
2 parents cd0a517 + cc4fa79 commit 6a07fd3

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

.github/actions/get-product-parameters/action.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ description: get product parameters for building product
33
author: datavisyn
44

55
inputs:
6-
dv_customers:
7-
description: "customers of datavisyn; seperated with ','"
8-
required: true
9-
type: string
106
branch_name:
117
description: "name of the current branch"
128
required: true
@@ -120,7 +116,6 @@ runs:
120116
echo "create_workspace=$create_workspace" >> "$GITHUB_OUTPUT"
121117
echo "stage=$stage" >> "$GITHUB_OUTPUT"
122118
env:
123-
DV_CUSTOMERS: ${{ inputs.dv_customers }}
124119
BRANCH_NAME: ${{ inputs.branch_name }}
125120
TIME_ZONE: ${{ inputs.time_zone }}
126121
shell: bash

.github/workflows/build-product.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
required: false
88
DV_BOT_USER:
99
required: false
10-
DV_CUSTOMERS:
11-
required: true
1210
DV_AWS_ECR_ROLE:
1311
required: false
1412
DV_AWS_REGION:
@@ -86,7 +84,6 @@ jobs:
8684
- uses: ./tmp/github-workflows/.github/actions/get-product-parameters
8785
id: get-parameters
8886
with:
89-
dv_customers: ${{ secrets.DV_CUSTOMERS }}
9087
branch_name: ${{ github.ref_name }}
9188
time_zone: ${{ env.TIME_ZONE }}
9289
build-single:
@@ -146,6 +143,26 @@ jobs:
146143
matrix:
147144
customer: ${{ fromJSON(needs.prepare-build.outputs.customers) }}
148145
steps:
146+
- name: determine stage to be deployed to
147+
id: get-parameters
148+
run: |
149+
# Try to split the customer from the format customer:stage
150+
customer="$(echo "$CUSTOMER_FULL" | cut -d ":" -s -f 1)"
151+
stage="$(echo "$CUSTOMER_FULL" | cut -d ":" -s -f 2)"
152+
# If nothing is found, we assume we just got the customer
153+
if [ -z "$customer" ]; then
154+
customer="$CUSTOMER_FULL"
155+
fi
156+
# And will deploy to develop if no stage is defined
157+
if [ -z "$stage" ]; then
158+
echo "customer $CUSTOMER_FULL does not include stage, using develop instead"
159+
stage="develop"
160+
fi
161+
echo "customer=$customer" >> "$GITHUB_OUTPUT"
162+
echo "stage=$stage" >> "$GITHUB_OUTPUT"
163+
env:
164+
CUSTOMER_FULL: ${{ matrix.customer }}
165+
shell: bash
149166
- name: trigger deployment
150167
uses: datavisyn/github-action-trigger-workflow@v1
151168
with:
@@ -155,5 +172,4 @@ jobs:
155172
workflow_file_name: "deploy-app.yml"
156173
ref: ${{ env.WORKFLOW_BRANCH }}
157174
github_user: ${{ secrets.DV_BOT_USER }}
158-
# TODO: The deployment is always triggered to develop, do we want to make this configurable?
159-
client_payload: '{ "app": "${{ needs.prepare-build.outputs.app }}", "customer": "${{ matrix.customer }}", "stage": "develop", "sub_app": "${{ needs.prepare-build.outputs.sub_app }}", "branch": "${{ needs.prepare-build.outputs.image_tag2 }}" }'
175+
client_payload: '{ "app": "${{ needs.prepare-build.outputs.app }}", "customer": "${{ steps.get-parameters.outputs.customer }}", "stage": "${{ steps.get-parameters.outputs.stage }}", "sub_app": "${{ needs.prepare-build.outputs.sub_app }}", "branch": "${{ needs.prepare-build.outputs.image_tag2 }}" }'

.github/workflows/build-single-product-part.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
required: false
1010
DV_BOT_USER:
1111
required: false
12-
DV_CUSTOMERS:
13-
required: true
1412
DV_AWS_ECR_ROLE:
1513
required: false
1614
DV_AWS_REGION:

.github/workflows/build-workspace-product-part.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ on:
99
required: false
1010
DV_BOT_USER:
1111
required: false
12-
DV_CUSTOMERS:
13-
required: true
1412
DV_AWS_ECR_ROLE:
1513
required: false
1614
DV_AWS_REGION:

.github/workflows/deploy-product.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
secrets:
66
DATAVISYN_BOT_REPO_TOKEN:
77
required: true
8-
DV_CUSTOMERS:
9-
required: true
108
DV_DEVOPS:
119
required: true
1210
DV_QMS:
@@ -75,7 +73,6 @@ jobs:
7573
- uses: ./tmp/github-workflows/.github/actions/get-product-parameters
7674
id: get-parameters
7775
with:
78-
dv_customers: ${{ secrets.DV_CUSTOMERS }}
7976
branch_name: ${{ github.ref_name }}
8077
time_zone: ${{ env.TIME_ZONE }}
8178
- name: trigger deployment

.github/workflows/release-product.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ on:
77
required: true
88
DV_DEVOPS:
99
required: true
10-
DV_CUSTOMERS:
11-
required: true
1210
DV_QMS:
1311
required: true
1412

@@ -208,9 +206,9 @@ jobs:
208206
echo "release_version=$release_version"
209207
echo "main_branch_name=$main_branch_name"
210208
echo "develop_branch_name=$develop_branch_name"
211-
echo "::set-output name=release_version::$release_version"
212-
echo "::set-output name=main_branch_name::$main_branch_name"
213-
echo "::set-output name=develop_branch_name::$develop_branch_name"
209+
echo "release_version=$release_version >> $GITHUB_OUTPUT"
210+
echo "main_branch_name=$main_branch_name >> $GITHUB_OUTPUT"
211+
echo "develop_branch_name=$develop_branch_name >> $GITHUB_OUTPUT"
214212
env:
215213
BRANCH_NAME: ${{ github.ref_name }}
216214
- name: delete release branch

0 commit comments

Comments
 (0)