From a5bdf0e2e6d718cb8af4d00b12f7ac00a3201f39 Mon Sep 17 00:00:00 2001 From: jguzman4 Date: Wed, 20 Sep 2017 10:41:44 -0700 Subject: [PATCH 1/2] changing the front end rules for dev and qa --- jenkinsfiles/full-demo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkinsfiles/full-demo b/jenkinsfiles/full-demo index 1072f6fc0..fc0812ff6 100644 --- a/jenkinsfiles/full-demo +++ b/jenkinsfiles/full-demo @@ -104,10 +104,10 @@ pipeline { steps { script { if ( env.BRANCH_NAME == 'master' ) { - deployToEnvironment("ec2-user", "dev-petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "dev-petclinic.liatr.io") + deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "dev.petclinic.liatr.io") } else{ - deployToEnvironment("ec2-user", "dev-petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${env.BRANCH_NAME}", "spring-petclinic", "dev-petclinic.liatr.io") + deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${env.BRANCH_NAME}", "spring-petclinic", "dev.petclinic.liatr.io") } } } @@ -131,7 +131,7 @@ pipeline { } agent any steps { - deployToEnvironment("ec2-user", "qa-petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "qa-petclinic.liatr.io") + deployToEnvironment("ec2-user", "qa.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "qa.petclinic.liatr.io") } } stage('Smoke test qa') { From fc1d921203b0fb6d76663f2b08b30ef16511191a Mon Sep 17 00:00:00 2001 From: Chad Duffin Date: Wed, 20 Sep 2017 12:53:03 -0700 Subject: [PATCH 2/2] LDOP-302 Removed deploy-prod, fixed regression test URLs. --- jenkinsfiles/full-demo | 274 +++++++++++++++++++---------------------- 1 file changed, 125 insertions(+), 149 deletions(-) diff --git a/jenkinsfiles/full-demo b/jenkinsfiles/full-demo index f48e49276..fd86271c4 100644 --- a/jenkinsfiles/full-demo +++ b/jenkinsfiles/full-demo @@ -14,162 +14,138 @@ pipeline { } steps { configFileProvider( - [configFile(fileId: 'nexus', variable: 'MAVEN_SETTINGS')]) { - sh 'mvn -s $MAVEN_SETTINGS clean deploy -DskipTests=true -B' - } + [configFile(fileId: 'nexus', variable: 'MAVEN_SETTINGS')]) { + sh 'mvn -s $MAVEN_SETTINGS clean deploy -DskipTests=true -B' } } - stage('Sonar') { - agent { - docker { - image 'sebp/sonar-runner' - args '-e SONAR_ACCOUNT_LOGIN -e SONAR_ACCOUNT_PASSWORD -e SONAR_DB_URL -e SONAR_DB_LOGIN -e SONAR_DB_PASSWORD --network=${LDOP_NETWORK_NAME}' - } - } - steps { - sh '/opt/sonar-runner-2.4/bin/sonar-runner -e -D sonar.login=${SONAR_ACCOUNT_LOGIN} -D sonar.password=${SONAR_ACCOUNT_PASSWORD} -D sonar.jdbc.url=${SONAR_DB_URL} -D sonar.jdbc.username=${SONAR_DB_LOGIN} -D sonar.jdbc.password=${SONAR_DB_PASSWORD}' + } + stage('Sonar') { + agent { + docker { + image 'sebp/sonar-runner' + args '-e SONAR_ACCOUNT_LOGIN -e SONAR_ACCOUNT_PASSWORD -e SONAR_DB_URL -e SONAR_DB_LOGIN -e SONAR_DB_PASSWORD --network=${LDOP_NETWORK_NAME}' } } - stage('Get Artifact') { - agent { - docker { - image 'maven:3.5.0' - args '-e INITIAL_ADMIN_USER -e INITIAL_ADMIN_PASSWORD --network=${LDOP_NETWORK_NAME}' - } + steps { + sh '/opt/sonar-runner-2.4/bin/sonar-runner -e -D sonar.login=${SONAR_ACCOUNT_LOGIN} -D sonar.password=${SONAR_ACCOUNT_PASSWORD} -D sonar.jdbc.url=${SONAR_DB_URL} -D sonar.jdbc.username=${SONAR_DB_LOGIN} -D sonar.jdbc.password=${SONAR_DB_PASSWORD}' + } + } + stage('Get Artifact') { + agent { + docker { + image 'maven:3.5.0' + args '-e INITIAL_ADMIN_USER -e INITIAL_ADMIN_PASSWORD --network=${LDOP_NETWORK_NAME}' } - steps { - sh 'mvn clean' - script { + } + steps { + sh 'mvn clean' + script { + pom = readMavenPom file: 'pom.xml' + getArtifact(pom.groupId, pom.artifactId, pom.version) + } + } + } + stage('Build container') { + agent any + steps { + script { + sh "docker build -t liatrio/petclinic-tomcat:${env.BRANCH_NAME} ." + if ( env.BRANCH_NAME == 'master' ) { pom = readMavenPom file: 'pom.xml' - getArtifact(pom.groupId, pom.artifactId, pom.version) - } - } - } - stage('Build container') { - agent any - steps { - script { - sh "docker build -t liatrio/petclinic-tomcat:${env.BRANCH_NAME} ." - if ( env.BRANCH_NAME == 'master' ) { - pom = readMavenPom file: 'pom.xml' - containerVersion = pom.version - sh "docker build -t liatrio/petclinic-tomcat:${containerVersion} ." - } - } - } - } - stage('Run local container') { - agent any - steps { - sh 'docker rm -f petclinic-tomcat-temp || true' - sh "docker run -d --network=${LDOP_NETWORK_NAME} --name petclinic-tomcat-temp liatrio/petclinic-tomcat:${env.BRANCH_NAME}" - } - } - stage('Smoke-Test & OWASP Security Scan') { - agent { - docker { - image 'maven:3.5.0' - args '--network=${LDOP_NETWORK_NAME}' - } - } - steps { - sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat-temp:8080/petclinic/" - } - } - stage('Stop local container') { - agent any - steps { - sh 'docker rm -f petclinic-tomcat-temp || true' - } - } - stage('Push to dockerhub') { - agent any - steps { - withCredentials([usernamePassword(credentialsId: 'dockerhub', passwordVariable: 'dockerPassword', usernameVariable: 'dockerUsername')]){ - script { - sh "docker login -u ${env.dockerUsername} -p ${env.dockerPassword}" - if ( env.BRANCH_NAME == 'master' ) { - sh "docker push liatrio/petclinic-tomcat:${containerVersion}" - } - else { - sh "docker push liatrio/petclinic-tomcat:${env.BRANCH_NAME}" - } - } - } - } - } - stage('Deploy to dev') { - agent any - steps { - script { - if ( env.BRANCH_NAME == 'master' ) { - deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "dev.petclinic.liatr.io") - } - else{ - deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${env.BRANCH_NAME}", "spring-petclinic", "dev.petclinic.liatr.io") - } - } - } - } - stage('Smoke test dev') { - agent { - docker { - image 'maven:3.5.0' - args '--network=${LDOP_NETWORK_NAME}' - } - } - steps { - 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" - } - } - stage('Deploy to qa') { - when { - branch 'master' - } - agent any - steps { - deployToEnvironment("ec2-user", "qa.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "qa.petclinic.liatr.io") - } - } - stage('Smoke test qa') { - when { - branch 'master' - } - agent { - docker { - image 'maven:3.5.0' - args '--network=${LDOP_NETWORK_NAME}' - } - } - steps { - 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?' - } - } - stage('Deploy to Prod') { - when { - branch 'master' - } - agent any - steps { - deployToEnvironment("ec2-user", "petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "prod-petclinic", "petclinic.liatr.io") - } - } - stage('Smoke test Prod') { - when { - branch 'master' - } - agent { - docker { - image 'maven:3.5.0' - args '--network=${LDOP_NETWORK_NAME}' - } - } - steps { - sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=https://petclinic.liatr.io/petclinic" + containerVersion = pom.version + sh "docker build -t liatrio/petclinic-tomcat:${containerVersion} ." } } } } + stage('Run local container') { + agent any + steps { + sh 'docker rm -f petclinic-tomcat-temp || true' + sh "docker run -d --network=${LDOP_NETWORK_NAME} --name petclinic-tomcat-temp liatrio/petclinic-tomcat:${env.BRANCH_NAME}" + } + } + stage('Smoke-Test & OWASP Security Scan') { + agent { + docker { + image 'maven:3.5.0' + args '--network=${LDOP_NETWORK_NAME}' + } + } + steps { + sh "cd regression-suite && mvn clean -B test -DPETCLINIC_URL=http://petclinic-tomcat-temp:8080/petclinic/" + } + } + stage('Stop local container') { + agent any + steps { + sh 'docker rm -f petclinic-tomcat-temp || true' + } + } + stage('Push to dockerhub') { + agent any + steps { + withCredentials([usernamePassword(credentialsId: 'dockerhub', passwordVariable: 'dockerPassword', usernameVariable: 'dockerUsername')]) { + script { + sh "docker login -u ${env.dockerUsername} -p ${env.dockerPassword}" + if ( env.BRANCH_NAME == 'master' ) { + sh "docker push liatrio/petclinic-tomcat:${containerVersion}" + } + else { + sh "docker push liatrio/petclinic-tomcat:${env.BRANCH_NAME}" + } + } + } + } + } + stage('Deploy to dev') { + agent any + steps { + script { + if ( env.BRANCH_NAME == 'master' ) { + deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "dev.petclinic.liatr.io") + } + else{ + deployToEnvironment("ec2-user", "dev.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${env.BRANCH_NAME}", "spring-petclinic", "dev.petclinic.liatr.io") + } + } + } + } + stage('Smoke test dev') { + agent { + docker { + image 'maven:3.5.0' + args '--network=${LDOP_NETWORK_NAME}' + } + } + steps { + 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" + } + } + stage('Deploy to qa') { + when { + branch 'master' + } + agent any + steps { + deployToEnvironment("ec2-user", "qa.petclinic.liatr.io", "petclinic-deploy-key", "${env.IMAGE}", "${containerVersion}", "spring-petclinic", "qa.petclinic.liatr.io") + } + } + stage('Smoke test qa') { + when { + branch 'master' + } + agent { + docker { + image 'maven:3.5.0' + args '--network=${LDOP_NETWORK_NAME}' + } + } + steps { + 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" + } + } + } +}