From 1b2914ae342e4ad310a05fe6c2e6a9e1b8823e44 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 24 Oct 2019 02:19:26 +0000 Subject: [PATCH] Update staging file with 55d6000 commit --- Jenkinsfile | 2 +- infra/kube/workloads/staging/deployment.yaml | 4 ++-- infra/kube/workloads/staging/service.yaml | 4 ++-- .../samples/petclinic/system/WelcomeController.java | 2 +- src/main/resources/messages/messages.properties | 2 +- src/main/resources/templates/error.html | 2 +- src/main/resources/templates/welcome.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 409f40ab5..883d57f3b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { stage('build') { when { - changeset "src/*" + changeset "src/**" } steps { diff --git a/infra/kube/workloads/staging/deployment.yaml b/infra/kube/workloads/staging/deployment.yaml index 596a4425f..5c06beb0f 100644 --- a/infra/kube/workloads/staging/deployment.yaml +++ b/infra/kube/workloads/staging/deployment.yaml @@ -12,12 +12,12 @@ spec: metadata: labels: app: pet-clinic - version: pc-5fb7fbc + version: pc-55d6000 spec: containers: - name: pet-clinic - image: "jenkinsdemosacr.azurecr.io/pet-clinic:pc-5fb7fbc" + image: "jenkinsdemosacr.azurecr.io/pet-clinic:pc-55d6000" ports: - containerPort: 8080 imagePullSecrets: diff --git a/infra/kube/workloads/staging/service.yaml b/infra/kube/workloads/staging/service.yaml index a1dbbe55d..0b4aabdd6 100644 --- a/infra/kube/workloads/staging/service.yaml +++ b/infra/kube/workloads/staging/service.yaml @@ -4,12 +4,12 @@ metadata: name: pet-clinic namespace: staging labels: - version: pc-5fb7fbc + version: pc-55d6000 spec: type: LoadBalancer selector: app: pet-clinic - version: pc-5fb7fbc + version: pc-55d6000 ports: - port: 80 protocol: TCP diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java index 1313dd520..7e96848b6 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java @@ -25,6 +25,6 @@ class WelcomeController { @GetMapping("/") public String welcome() { - return "Welcome"; + return "welcome"; } } diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties index 173417a10..5f13ea1aa 100644 --- a/src/main/resources/messages/messages.properties +++ b/src/main/resources/messages/messages.properties @@ -1,4 +1,4 @@ -welcome=Welcome +welcome=Welcome to ignite required=is required notFound=has not been found duplicate=is already in use diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index b9026690e..afa50aa4f 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -8,4 +8,4 @@

Exception message

- \ No newline at end of file + diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html index 0d4ea20c5..2cd83b671 100644 --- a/src/main/resources/templates/welcome.html +++ b/src/main/resources/templates/welcome.html @@ -4,7 +4,7 @@ -

Hello Ignite

+

Welcome!!!