From 8c82af0cb415faede2191dd6018d823632ba8a4c Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Fri, 7 Jul 2023 22:50:16 +0530 Subject: [PATCH 1/6] Changed the docker username --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ac7d57..aa8c212 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any environment { //be sure to replace "willbla" with your own Docker Hub username - DOCKER_IMAGE_NAME = "willbla/train-schedule" + DOCKER_IMAGE_NAME = "dhruvdeepak/train-schedule" } stages { stage('Build') { From 62d99e9cda45d75474f96d3c16b91a3905b27a27 Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Fri, 7 Jul 2023 23:25:56 +0530 Subject: [PATCH 2/6] Changes made to Jenkinfile to remove manual intervention --- .vscode/extensions.json | 13 +++++++++++++ Jenkinsfile | 33 ++++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 .vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..d1987c7 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,13 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. + // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp + + // List of extensions which should be recommended for users of this workspace. + "recommendations": [ + + ], + // List of extensions recommended by VS Code that should not be recommended for users of this workspace. + "unwantedRecommendations": [ + + ] +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index aa8c212..af8ceba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline { environment { //be sure to replace "willbla" with your own Docker Hub username DOCKER_IMAGE_NAME = "dhruvdeepak/train-schedule" + CANARY_REPLICAS = 0 } stages { stage('Build') { @@ -53,21 +54,26 @@ pipeline { ) } } - stage('DeployToProduction') { + stage('SmokeTest') { when { branch 'master' } - environment { - CANARY_REPLICAS = 0 + steps { + script { + sleep(time: 5) + def response = httpRequest (url: "http://$KUBE_MASTER_IP:8081/", timeout: 30) + if (response.status != 200) { + error("Smoke test against canary deployment failed.") + } + } + } + } + stage('DeployToProduction') { + when { + branch 'master' } steps { - input 'Deploy to Production?' milestone(1) - kubernetesDeploy( - kubeconfigId: 'kubeconfig', - configs: 'train-schedule-kube-canary.yml', - enableConfigSubstitution: true - ) kubernetesDeploy( kubeconfigId: 'kubeconfig', configs: 'train-schedule-kube.yml', @@ -76,4 +82,13 @@ pipeline { } } } + post { + cleanup { + kubernetesDeploy( + kubeconfigId: 'kubeconfig', + configs: 'train-schedule-kube-canary.yml', + enableConfigSubstitution: true + ) + } + } } \ No newline at end of file From 8a094bfd7b07e0ce608b2cdef4ff4671547f7822 Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Fri, 7 Jul 2023 23:46:26 +0530 Subject: [PATCH 3/6] Added a line for announcement --- views/index.jade | 1 + 1 file changed, 1 insertion(+) diff --git a/views/index.jade b/views/index.jade index 6e6be71..a5ed649 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,6 +3,7 @@ extends layout block content h1 Find your train! p Select your train below to see its current schedule. + h3 Announcement! Anew train line will be added on June 15th! #wrapper #trainList h2 Trains From c05f885ba9c5df523c7f1c5f4f3ed1763c4916cc Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Fri, 7 Jul 2023 23:54:53 +0530 Subject: [PATCH 4/6] Small change in the text spacing. --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index a5ed649..733ba2a 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,7 +3,7 @@ extends layout block content h1 Find your train! p Select your train below to see its current schedule. - h3 Announcement! Anew train line will be added on June 15th! + h3 Announcement! A new train line will be added on June 15th! #wrapper #trainList h2 Trains From 6aef4ec35b6ff5f4705955d777977dade6ca71e3 Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Fri, 7 Jul 2023 23:56:51 +0530 Subject: [PATCH 5/6] Added a new message for BOOK NOW --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index a5ed649..f87e5ab 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,7 +3,7 @@ extends layout block content h1 Find your train! p Select your train below to see its current schedule. - h3 Announcement! Anew train line will be added on June 15th! + h3 Announcement! A new train line will be added on June 15th! Book your tickets NOW! #wrapper #trainList h2 Trains From cfb77f659a53350e4d42ef729dd115ff7e69ede0 Mon Sep 17 00:00:00 2001 From: dhruvdeepak <135850710+dhruvdeepak@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:12:21 +0530 Subject: [PATCH 6/6] Update index.jade --- views/index.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/index.jade b/views/index.jade index 733ba2a..c9f537e 100644 --- a/views/index.jade +++ b/views/index.jade @@ -3,7 +3,7 @@ extends layout block content h1 Find your train! p Select your train below to see its current schedule. - h3 Announcement! A new train line will be added on June 15th! + h3 Announcement! A new train line will be added on June 15th! Book NOW for best offers! #wrapper #trainList h2 Trains @@ -11,4 +11,4 @@ block content #trainInfo strong #trainSchedule - strong Select a train to view its current schedule. \ No newline at end of file + strong Select a train to view its current schedule.