Skip to content

Commit df3835e

Browse files
committed
Merge remote-tracking branch 'origin/hotfix/cci-perf-testing'
2 parents 7e5cc9d + e99fb44 commit df3835e

File tree

5 files changed

+52
-176
lines changed

5 files changed

+52
-176
lines changed

.circleci/config.yml

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ deploy_steps: &deploy_steps
4040
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
4141
4242
jobs:
43-
test:
43+
UnitTests:
4444
docker:
4545
- image: circleci/node:12.16.1
4646
- image: circleci/postgres:9.6.2-alpine
@@ -102,23 +102,69 @@ jobs:
102102
APPNAME: "projects-api"
103103
steps: *deploy_steps
104104

105+
Connect-Performance-Testing:
106+
docker:
107+
# specify the version you desire here
108+
- image: circleci/openjdk:8-jdk
109+
110+
# Specify service dependencies here if necessary
111+
# CircleCI maintains a library of pre-built images
112+
# documented at https://circleci.com/docs/2.0/circleci-images/
113+
# - image: circleci/postgres:9.4
114+
115+
working_directory: ~/repo
116+
117+
environment:
118+
# Customize the JVM maximum heap limit
119+
MAVEN_OPTS: -Xmx3200m
120+
121+
steps:
122+
- checkout
123+
124+
# Download and cache dependencies
125+
- restore_cache:
126+
keys:
127+
- v1-dependencies-{{ checksum "pom.xml" }}
128+
# fallback to using the latest cache if no exact match is found
129+
- v1-dependencies-
130+
131+
- run: mvn dependency:go-offline
132+
133+
- save_cache:
134+
paths:
135+
- ~/.m2
136+
key: v1-dependencies-{{ checksum "pom.xml" }}
137+
138+
- run: mvn verify
139+
140+
- store_artifacts:
141+
path: target/jmeter/reports
142+
105143
workflows:
106144
version: 2
107-
build:
145+
Connect Project Services:
108146
jobs:
109-
- test:
147+
- UnitTests:
110148
context : org-global
111149
- deployDev:
112150
context : org-global
113151
requires:
114-
- test
152+
- UnitTests
115153
filters:
116154
branches:
117155
only: ['develop']
118156
- deployProd:
119157
context : org-global
120158
requires:
121-
- test
159+
- UnitTests
122160
filters:
123161
branches:
124-
only: ['master']
162+
only: ['master']
163+
- Hold [Performance-Testing]:
164+
type: approval
165+
requires:
166+
- deployDev
167+
- deployProd
168+
- Connect-Performance-Testing:
169+
requires:
170+
- Hold [Performance-Testing]

config.yml

Lines changed: 0 additions & 170 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)