DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-19 05:55:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/liatrio/spring-petclinic into LDOP-302-tmp

Browse source
This commit is contained in:
Chad Duffin 2017-09-20 12:43:10 -07:00
commit 6df3f03097
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jenkinsfiles/full-demo
View file

@ -73,8 +73,7 @@ pipeline {
}
}
steps {
sh "cd regression-suite"
sh "mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat:8080/petclinic/"
sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat-temp:8080/petclinic/"
}
}
stage('Stop local container') {
@ -120,8 +119,7 @@ pipeline {
}
}
steps {
sh "cd regression-suite"
sh "mvn clean -B test -DPETCLINIC_URL=https://dev-petclinic.liatr.io/petclinic"
sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://dev-petclinic.liatr.io/petclinic"
echo "Should be accessible at https://dev-petclinic.liatr.io/petclinic"
}
}
@ -145,8 +143,7 @@ pipeline {
}
}
steps {
sh "cd regression-suite"
sh "mvn clean -B test -DPETCLINIC_URL=https://qa-petclinic.liatr.io/petclinic"
sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://qa-petclinic.liatr.io/petclinic"
echo "Should be accessible at https://qa-petclinic.liatr.io/petclinic"
input 'Deploy to Prod?'
}
@ -171,8 +168,7 @@ pipeline {
}
}
steps {
sh "cd regression-suite"
sh "mvn clean -B test -DPETCLINIC_URL=https://petclinic.liatr.io/petclinic"
sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://petclinic.liatr.io/petclinic"
}
}
}

2
regression-suite/pom.xml
View file

@ -17,7 +17,7 @@
<dependency>
<groupId>info.cukes</groupId>
<artifactId>cucumber-java</artifactId>
<version>1.2.2</version>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
<dependency>

2
src/main/webapp/WEB-INF/jsp/vets/vetList.jsp
View file

@ -15,7 +15,7 @@
<div class="container">
<jsp:include page="../fragments/bodyHeader.jsp"/>
<h2>Vets</h2>
<h2>Veterinarians</h2>
<datatables:table id="vets" data="${vets.vetList}" row="vet" theme="bootstrap2" cssClass="table table-striped"
pageable="false" info="false">