From 02fc50084a6483f16828fcc98c0a086797d0d764 Mon Sep 17 00:00:00 2001 From: willb Date: Wed, 16 May 2018 10:03:35 -0400 Subject: [PATCH 1/6] change text to state that devops is awesome --- src/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index 61a65d710..02830d9a7 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@

- DevOps is great! + DevOps is awesome!

- \ No newline at end of file + From e1cd03c82ea36c317c1d527c76a70b743c576485 Mon Sep 17 00:00:00 2001 From: NikitaWankhad <105377177+NikitaWankhad@users.noreply.github.com> Date: Thu, 1 May 2025 14:58:23 +0530 Subject: [PATCH 2/6] changed index.html --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 02830d9a7..fca40b5c6 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@

- DevOps is awesome! + DevOps is Super.......!

From 9086afb5b91bb6dd216f743b7cb6e78c12519633 Mon Sep 17 00:00:00 2001 From: NikitaWankhad <105377177+NikitaWankhad@users.noreply.github.com> Date: Thu, 1 May 2025 15:14:40 +0530 Subject: [PATCH 3/6] updated to new-feature branch from master branch --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ade6c6f24..214d300c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } stage('DeployToStage') { when { - branch 'master' + branch 'new-feature' } steps { withCredentials([string(credentialsId: 'cloud_user_pw', variable: 'USERPASS')]) { @@ -37,7 +37,7 @@ pipeline { } stage('DeployToProd') { when { - branch 'master' + branch 'new-feature' } steps { input 'Does the staging environment look OK?' @@ -65,4 +65,4 @@ pipeline { } } } -} \ No newline at end of file +} From f038f8d897ac831b722b8b68c80a30a63594fef6 Mon Sep 17 00:00:00 2001 From: NikitaWankhad <105377177+NikitaWankhad@users.noreply.github.com> Date: Thu, 1 May 2025 15:28:51 +0530 Subject: [PATCH 4/6] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 214d300c6..c8d6f7101 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } stage('DeployToStage') { when { - branch 'new-feature' + branch 'master' } steps { withCredentials([string(credentialsId: 'cloud_user_pw', variable: 'USERPASS')]) { @@ -37,7 +37,7 @@ pipeline { } stage('DeployToProd') { when { - branch 'new-feature' + branch 'master' } steps { input 'Does the staging environment look OK?' From dc6e27df18240d228774a71bd88f7c7d0e2c2773 Mon Sep 17 00:00:00 2001 From: NikitaWankhad <105377177+NikitaWankhad@users.noreply.github.com> Date: Thu, 1 May 2025 15:37:09 +0530 Subject: [PATCH 5/6] Update Jenkinsfile to broken-feature --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8d6f7101..3d0b46ea3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } stage('DeployToStage') { when { - branch 'master' + branch 'broken-feature' } steps { withCredentials([string(credentialsId: 'cloud_user_pw', variable: 'USERPASS')]) { @@ -37,7 +37,7 @@ pipeline { } stage('DeployToProd') { when { - branch 'master' + branch 'broken-feature' } steps { input 'Does the staging environment look OK?' From 9f56f623bc3bd0ea0521e26688dedf40fb4b7ddf Mon Sep 17 00:00:00 2001 From: NikitaWankhad <105377177+NikitaWankhad@users.noreply.github.com> Date: Thu, 1 May 2025 16:32:29 +0530 Subject: [PATCH 6/6] Update Jenkinsfile --- Jenkinsfile | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3d0b46ea3..be246a301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,33 +8,6 @@ pipeline { archiveArtifacts artifacts: 'src/index.html' } } - stage('DeployToStage') { - when { - branch 'broken-feature' - } - steps { - withCredentials([string(credentialsId: 'cloud_user_pw', variable: 'USERPASS')]) { - sshPublisher( - failOnError: true, - publishers: [ - sshPublisherDesc( - configName: 'staging', - sshCredentials: [ - username: 'cloud_user', - encryptedPassphrase: "$USERPASS" - ], - transfers: [ - sshTransfer( - sourceFiles: 'src/**', - removePrefix: 'src/' - ) - ] - ) - ] - ) - } - } - } stage('DeployToProd') { when { branch 'broken-feature'