Skip to content

Commit fd7b884

Browse files
ci: Fix Automated Smoke Testing flow
1 parent 04a2ebe commit fd7b884

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

.circleci/config.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ parameters:
33
run_basedeployment:
44
default: true
55
type: boolean
6-
run_smoketesting:
7-
default: false
8-
type: boolean
96
run_performancetesting:
107
default: false
118
type: boolean
@@ -73,6 +70,7 @@ jobs:
7370
source awsenvconf
7471
source buildenvvar
7572
./master_deploy.sh -d ECS -e DEV -t latest -s dev_communityapp_taskvar -i communityapp
73+
7674
# Build & Deploy against testing backend
7775
"build-test":
7876
<<: *defaults
@@ -100,6 +98,7 @@ jobs:
10098
source awsenvconf
10199
source buildenvvar
102100
./master_deploy.sh -d ECS -e DEV -t latest -s test_communityapp_taskvar -i communityapp
101+
103102
# Build & Deploy against testing backend
104103
"build-qa":
105104
<<: *defaults
@@ -127,6 +126,7 @@ jobs:
127126
source awsenvconf
128127
source buildenvvar
129128
./master_deploy.sh -d ECS -e DEV -t latest -s qa_communityapp_taskvar -i communityapp
129+
130130
# Build & Deploy against prod api backend
131131
"build-prod-beta":
132132
<<: *defaults
@@ -182,11 +182,6 @@ jobs:
182182
source awsenvconf
183183
source buildenvvar
184184
./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp
185-
curl --request POST \
186-
--url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
187-
--header "Circle-Token: ${CIRCLE_TOKEN}" \
188-
--header 'content-type: application/json' \
189-
--data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
190185
191186
# Build & Deploy against production backend
192187
"build-prod":
@@ -215,11 +210,8 @@ jobs:
215210
source awsenvconf
216211
source buildenvvar
217212
./master_deploy.sh -d ECS -e PROD -t latest -s prod_communityapp_taskvar -i communityapp
218-
curl --request POST \
219-
--url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
220-
--header "Circle-Token: ${CIRCLE_TOKEN}" \
221-
--header 'content-type: application/json' \
222-
--data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
213+
214+
# Automated Smoke Testing against Staging
223215
Smoke-Testing-On-Staging:
224216
<<: *defaults
225217
steps:
@@ -244,6 +236,8 @@ jobs:
244236
./automated-smoke-test/smoketest.sh automation-config-staging.json prod
245237
- store_artifacts:
246238
path: /automated-smoke-test/test-results
239+
240+
# Automated Smoke Testing against Production
247241
Smoke-Testing-On-Production:
248242
<<: *defaults
249243
steps:
@@ -266,6 +260,7 @@ jobs:
266260
source awsenvconf
267261
source buildenvvar
268262
./automated-smoke-test/smoketest.sh automation-config-prod.json prod
263+
269264
# Test job for the cases when we do not need deployment. It just rapidly
270265
# installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
271266
# Jest unit-tests).
@@ -282,7 +277,7 @@ jobs:
282277
paths:
283278
- node_modules
284279
- run: npm test
285-
280+
286281
Performance-Testing:
287282
docker:
288283
# specify the version you desire here
@@ -320,7 +315,7 @@ jobs:
320315

321316
- store_artifacts:
322317
path: target/jmeter/reports
323-
318+
324319
workflows:
325320
version: 2
326321
Build:
@@ -384,11 +379,9 @@ workflows:
384379

385380
Smoke Testing:
386381
when:
387-
and:
388-
- << pipeline.parameters.run_smoketesting >>
389-
- or:
390-
- equal: [ develop, << pipeline.git.branch >> ]
391-
- equal: [ master, << pipeline.git.branch >> ]
382+
or:
383+
- equal: [ develop, << pipeline.git.branch >> ]
384+
- equal: [ master, << pipeline.git.branch >> ]
392385
jobs:
393386
- Hold [Smoke-Testing]:
394387
type: approval

0 commit comments

Comments
 (0)