github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-29 08:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #62 from overleaf/csh-acceptance-test-creds2

Browse source 
Move acceptance test cred to docker-compose-config.yml
This commit is contained in:
Christopher Hoskin 2020-07-21 15:30:51 +01:00 committed by GitHub
commit a11ea11e31
9 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/docstore/.eslintrc
View file

@ -8,7 +8,7 @@
"prettier/standard"
],
"parserOptions": {
"ecmaVersion": 2017
"ecmaVersion": 2018
},
"plugins": [
"mocha",

4
services/docstore/Jenkinsfile vendored
View file

@ -52,9 +52,7 @@ pipeline {
stage('Acceptance Tests') {
steps {
withCredentials([usernamePassword(credentialsId: 'S3_DOCSTORE_TEST_AWS_KEYS', passwordVariable: 'AWS_SECRET_ACCESS_KEY', usernameVariable: 'AWS_ACCESS_KEY_ID')]) {
sh 'AWS_BUCKET="sl-acceptance-tests" AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
}
sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_acceptance'
}
}

3
services/docstore/Makefile
View file

@ -12,9 +12,6 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
BRANCH_NAME=$(BRANCH_NAME) \
PROJECT_NAME=$(PROJECT_NAME) \
MOCHA_GREP=${MOCHA_GREP} \
AWS_BUCKET=${AWS_BUCKET} \
AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
docker-compose ${DOCKER_COMPOSE_FLAGS}
DOCKER_COMPOSE_TEST_ACCEPTANCE = \

5
services/docstore/README.md
View file

@ -3,7 +3,10 @@ overleaf/docstore
A CRUD API for storing and updating text documents in projects
## Tests
```
AWS_BUCKET=**** AWS_ACCESS_KEY_ID=**** AWS_SECRET_ACCESS_KEY=**** make test
```
License
-------

4
services/docstore/buildscript.txt
View file

@ -1,5 +1,5 @@
docstore
--acceptance-creds=aws
--acceptance-creds=None
--dependencies=mongo
--docker-repos=gcr.io/overleaf-ops
--env-add=
@ -7,4 +7,4 @@ docstore
--language=es
--node-version=10.21.0
--public-repo=True
--script-version=2.2.0
--script-version=2.3.0

14
services/docstore/docker-compose-config.yml Normal file
View file

@ -0,0 +1,14 @@
version: "2.3"
services:
dev:
environment:
- AWS_BUCKET
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
ci:
environment:
- AWS_BUCKET
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY

6
services/docstore/docker-compose.ci.yml
View file

@ -16,14 +16,14 @@ services:
test_acceptance:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
extends:
file: docker-compose-config.yml
service: ci
environment:
ELASTIC_SEARCH_DSN: es:9200
REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_BUCKET: ${AWS_BUCKET}
MOCHA_GREP: ${MOCHA_GREP}
NODE_ENV: test
depends_on:

6
services/docstore/docker-compose.yml
View file

@ -21,14 +21,14 @@ services:
volumes:
- .:/app
working_dir: /app
extends:
file: docker-compose-config.yml
service: dev
environment:
ELASTIC_SEARCH_DSN: es:9200
REDIS_HOST: redis
MONGO_HOST: mongo
POSTGRES_HOST: postgres
AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_BUCKET: ${AWS_BUCKET}
MOCHA_GREP: ${MOCHA_GREP}
LOG_LEVEL: ERROR
NODE_ENV: test

2
services/docstore/package.json
View file

@ -48,7 +48,7 @@
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-standard": "^4.0.1",
"mocha": "^7.1.1",
"prettier": "^2.0.1",
"prettier": "^2.0.0",
"prettier-eslint-cli": "^5.0.0",
"request": "~2.88.2",
"sandboxed-module": "~2.0.3",