diff --git a/Jenkinsfile b/Jenkinsfile index 5979f83..2637920 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { stages { stage('Default Build pointing to Staging DB') { steps { - sh "mvn clean package -DskipTests -DbuildDirectory=staging/target -DegaAcccession-db.url=${stagingPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAcccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-staging -Dddl-behaviour=${params.DbBehaviour}" + sh "mvn clean package -DskipTests -DbuildDirectory=staging/target -DegaAccession-db.url=${stagingPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-staging -Dddl-behaviour=${params.DbBehaviour}" } } stage('Build For FallBack And Production') { @@ -35,9 +35,9 @@ pipeline { } steps { echo 'Build pointing to FallBack DB' - sh "mvn clean package -DskipTests -DbuildDirectory=fallback/target -DegaAcccession-db.url=${fallBackPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAcccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-fallback -Dddl-behaviour=${params.DbBehaviour}" + sh "mvn clean package -DskipTests -DbuildDirectory=fallback/target -DegaAccession-db.url=${fallBackPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-fallback -Dddl-behaviour=${params.DbBehaviour}" echo 'Build pointing to Production DB' - sh "mvn clean package -DskipTests -DbuildDirectory=production/target -DegaAcccession-db.url=${productionPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAcccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-production -Dddl-behaviour=${params.DbBehaviour}" + sh "mvn clean package -DskipTests -DbuildDirectory=production/target -DegaAccession-db.url=${productionPostgresDbUrl} -DegaAccession-db.username=${postgresDBUserName} -DegaAccession-db.password=${postgresDBPassword} -Dinstance.id=ega-accession-01-production -Dddl-behaviour=${params.DbBehaviour}" } } stage('Deploy To Staging') { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index eaeeb76..997b412 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -26,9 +26,9 @@ endpoints.jmx.domain=ega-accession # DATABASES ##################################################################################### spring.jpa.hibernate.use-new-id-generator-mappings=true -spring.datasource.url=@egaAcccession-db.url@ +spring.datasource.url=@egaAccession-db.url@ spring.datasource.username=@egaAccession-db.username@ -spring.datasource.password=@egaAcccession-db.password@ +spring.datasource.password=@egaAccession-db.password@ spring.jpa.hibernate.ddl-auto=@ddl-behaviour@ spring.jpa.generate-ddl=true #####################################################################################