Skip to content

Commit

Permalink
Added travis beanstalk deploy back
Browse files Browse the repository at this point in the history
  • Loading branch information
Craig Cook committed Sep 14, 2017
1 parent 340cc42 commit f8288ad
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 17 deletions.
26 changes: 13 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@ cache:

before_install:
- sudo apt-get install jq
- chmod +x scripts/JMeterInstaller.py
- python scripts/JMeterInstaller.py
# - chmod +x scripts/JMeterInstaller.py
# - python scripts/JMeterInstaller.py
- wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)

env: JMETER_PATH=./

jobs:
include:
- stage: test
script: mvn test cobertura:cobertura coveralls:cobertura && java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r target/site/cobertura/coverage.xml
script: mvn test cobertura:cobertura coveralls:cobertura && java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l java -r target/site/cobertura/coverage.xml
# - stage: publish artifact
# script: mvn -s .travis.settings.xml deploy
# skip_cleanup: true
# - stage: deploy to test
# script: mvn package
# deploy:
# provider: elasticbeanstalk
# skip_cleanup: true
# zip_file: target/movie-service.jar
# access_key_id: $AWS_ACCESS_KEY_ID
# secret_access_key: $AWS_SECRET_ACCESS_KEY
# bucket_name: $AWS_BUCKET_NAME
# region: "eu-west-2"
# app: "movie-service"
# env: "movie-service-test"
deploy:
provider: elasticbeanstalk
skip_cleanup: true
zip_file: target/movie-service.jar
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket_name: $AWS_BUCKET_NAME
region: "eu-west-2"
app: "movie-service"
env: "movie-service-test"
# - stage: performance test
# script:
# - rm -rf results && mkdir results
Expand Down
13 changes: 9 additions & 4 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ spring.data.rest.basePath=/api
#security.ignored=/**
#security.basic.enable: false

spring.jpa.hibernate.ddl-auto=create
spring.datasource.url=jdbc:mysql://localhost:3306/movie_service
spring.datasource.username=movieservice
spring.datasource.password=password
#spring.jpa.hibernate.ddl-auto=create
#spring.datasource.url=jdbc:mysql://localhost:3306/movie_service
#spring.datasource.username=movieservice
#spring.datasource.password=password

spring.datasource.driver-class-name=org.h2.Driver
spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
spring.datasource.username=sa
spring.datasource.password=sa

0 comments on commit f8288ad

Please sign in to comment.