Skip to content

Commit

Permalink
Merge pull request #194 from flexion/staging
Browse files Browse the repository at this point in the history
Sprint 2
  • Loading branch information
sadlerw authored Nov 18, 2018
2 parents a3681f5 + 54f5aec commit 746e588
Show file tree
Hide file tree
Showing 168 changed files with 5,768 additions and 2,919 deletions.
12 changes: 6 additions & 6 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ web-client/dist
web-client/node_modules
web-client/terraform/main/.terraform
web-client/terraform/common/.terraform
document-service/node_modules
document-service/.dynamodb
document-service/.nyc_output
document-service/.serverless
document-service/coverage
document-service/terraform/main/.terraform
efcms-service/node_modules
efcms-service/.dynamodb
efcms-service/.nyc_output
efcms-service/.serverless
efcms-service/coverage
efcms-service/terraform/main/.terraform
management/management/.terraform
web-client
.git
4 changes: 2 additions & 2 deletions Dockerfile.cypress
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ RUN apt-get -y install default-jre

#WORKDIR /home/app

#COPY document-service/package.json /home/app/document-service/package.json
#WORKDIR /home/app/document-service
#COPY efcms-service/package.json /home/app/efcms-service/package.json
#WORKDIR /home/app/efcms-service
#RUN npm install
#COPY . /home/app

Expand Down
11 changes: 6 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ pipeline {
]
}
}
stage('document-service') {
stage('efcms-service') {
when {
expression {
return checkCommit('document-service')
return checkCommit('efcms-service')
}
}
steps {
Expand Down Expand Up @@ -70,7 +70,7 @@ pipeline {
script {
def runner = docker.build 'pa11y', '-f Dockerfile.pa11y .'
runner.inside('-v /home/tomcat:/home/tomcat -v /etc/passwd:/etc/passwd') {
dir('document-service') {
dir('efcms-service') {
sh 'npm i'
sh 'npm run start:local &'
}
Expand All @@ -89,9 +89,10 @@ pipeline {
script {
def runner = docker.build 'cypress', '-f Dockerfile.cypress .'
runner.inside('-v /home/tomcat:/home/tomcat -v /etc/passwd:/etc/passwd') {
dir('document-service') {
dir('efcms-service') {
sh 'npm i'
sh 'npm run start:local &'
sh "./node_modules/.bin/sls dynamodb install -s local -r us-east-1 --domain noop --accountId noop --casesTableName efcms-cases-local --documentsTableName efcms-documents-local"
sh 'npm start &'
sh '../wait-until.sh http://localhost:3000/v1/swagger'
}
dir('web-client') {
Expand Down
10 changes: 0 additions & 10 deletions document-service/run-serverless.sh

This file was deleted.

Loading

0 comments on commit 746e588

Please sign in to comment.