diff --git a/Jenkinsfile b/Jenkinsfile index e706879a4..f225377fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -155,9 +155,9 @@ pipeline { } stage('Blue/Green Prod Deploy') { - when { + /*when { branch 'master' - } + }*/ agent { dockerfile { filename "blue-green/Dockerfile" @@ -176,9 +176,9 @@ pipeline { } stage('Blue/Green Prod Regression Test') { - when { + /*when { branch 'master' - } + }*/ agent { dockerfile { filename "blue-green/Dockerfile" @@ -197,15 +197,16 @@ pipeline { } stage('Blue/Green Prod Toggle Load Balancer') { - when { + /*when { branch 'master' - } + }*/ agent { dockerfile { filename "blue-green/Dockerfile" } } steps { + input "Toggle Prod Load Balancer?" withCredentials([ usernamePassword(credentialsId: 'aws', usernameVariable: 'AWS_ACCESS_KEY_ID', passwordVariable: 'AWS_SECRET_ACCESS_KEY'), file(credentialsId: 'petclinic-deploy-key', variable: 'DEPLOY_KEY_PATH') diff --git a/blue-green/blue-green b/blue-green/blue-green index fc5ba3ed8..cb8690f58 100755 --- a/blue-green/blue-green +++ b/blue-green/blue-green @@ -1,4 +1,4 @@ -#!/bin/bash -xe +#!/bin/bash -e # This script executes a blue/green deployment on the petclinic # production infrastructure. diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css index dbf904c07..b9e1c7cdc 100644 --- a/src/main/webapp/resources/css/petclinic.css +++ b/src/main/webapp/resources/css/petclinic.css @@ -12,7 +12,7 @@ input[type="text"] { } .navbar .nav > li > a { - color: #000000 + color: #FF0000 } .form-horizontal .control-label {