Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Header changes #10

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -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": [

]
}
35 changes: 25 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ 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"
CANARY_REPLICAS = 0
}
stages {
stage('Build') {
Expand Down Expand Up @@ -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',
Expand All @@ -76,4 +82,13 @@ pipeline {
}
}
}
post {
cleanup {
kubernetesDeploy(
kubeconfigId: 'kubeconfig',
configs: 'train-schedule-kube-canary.yml',
enableConfigSubstitution: true
)
}
}
}
3 changes: 2 additions & 1 deletion views/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ 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! Book NOW for best offers!
#wrapper
#trainList
h2 Trains
#trains.d-flex.flex-row
#trainInfo
strong <span id='trainName'></span>
#trainSchedule
strong Select a train to view its current schedule.
strong Select a train to view its current schedule.