From 985519a8d40abb7586eec3a977a46a8e93e91257 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 01:12:37 -0500
Subject: [PATCH 01/55] Update Jenkinsfile
---
Jenkinsfile | 130 ++--------------------------------------------------
1 file changed, 3 insertions(+), 127 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3fec481e..88af4a7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,134 +1,10 @@
pipeline {
- agent none
-
- environment {
- MAJOR_VERSION = 1
- }
-
+ agent any
stages {
- stage('Say Hello') {
- agent any
-
- steps {
- sayHello 'Awesome Student!'
- }
- }
- stage('Git Information') {
- agent any
-
- steps {
- echo "My Branch Name: ${env.BRANCH_NAME}"
-
- script {
- def myLib = new linuxacademy.git.gitStuff();
-
- echo "My Commit: ${myLib.gitCommit("${env.WORKSPACE}/.git")}"
- }
- }
- }
- stage('Unit Tests') {
- agent {
- label 'apache'
- }
- steps {
- sh 'ant -f test.xml -v'
- junit 'reports/result.xml'
- }
- }
- stage('build') {
- agent {
- label 'apache'
- }
- steps {
+ stage ('build') {
+ steps{
sh 'ant -f build.xml -v'
}
- post {
- success {
- archiveArtifacts artifacts: 'dist/*.jar', fingerprint: true
- }
- }
- }
- stage('deploy') {
- agent {
- label 'apache'
- }
- steps {
- sh "if ![ -d '/var/www/html/rectangles/all/${env.BRANCH_NAME}' ]; then mkdir /var/www/html/rectangles/all/${env.BRANCH_NAME}; fi"
- sh "cp dist/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all/${env.BRANCH_NAME}/"
- }
- }
- stage("Running on CentOS") {
- agent {
- label 'CentOS'
- }
- steps {
- sh "wget http://brandon4231.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
- sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
- }
- }
- stage("Test on Debian") {
- agent {
- docker 'openjdk:8u121-jre'
- }
- steps {
- sh "wget http://brandon4231.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
- sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
- }
- }
- stage('Promote to Green') {
- agent {
- label 'apache'
- }
- when {
- branch 'master'
- }
- steps {
- sh "cp /var/www/html/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
- }
- }
- stage('Promote Development Branch to Master') {
- agent {
- label 'apache'
- }
- when {
- branch 'development'
- }
- steps {
- echo "Stashing Any Local Changes"
- sh 'git stash'
- echo "Checking Out Development Branch"
- sh 'git checkout development'
- echo 'Checking Out Master Branch'
- sh 'git pull origin'
- sh 'git checkout master'
- echo 'Merging Development into Master Branch'
- sh 'git merge development'
- echo 'Pushing to Origin Master'
- sh 'git push origin master'
- echo 'Tagging the Release'
- sh "git tag rectangle-${env.MAJOR_VERSION}.${env.BUILD_NUMBER}"
- sh "git push origin rectangle-${env.MAJOR_VERSION}.${env.BUILD_NUMBER}"
- }
- post {
- success {
- emailext(
- subject: "${env.JOB_NAME} [${env.BUILD_NUMBER}] Development Promoted to Master",
- body: """
'${env.JOB_NAME} [${env.BUILD_NUMBER}]' Development Promoted to Master":
- Check console output at "${env.JOB_NAME} [${env.BUILD_NUMBER}]"
""",
- to: "brandon@linuxacademy.com"
- )
- }
- }
- }
- }
- post {
- failure {
- emailext(
- subject: "${env.JOB_NAME} [${env.BUILD_NUMBER}] Failed!",
- body: """'${env.JOB_NAME} [${env.BUILD_NUMBER}]' Failed!":
- Check console output at "${env.JOB_NAME} [${env.BUILD_NUMBER}]"
""",
- to: "brandon@linuxacademy.com"
- )
}
}
}
From e7a38599d8e269df3e5dac9e92526dad9b7e9217 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 01:58:24 -0500
Subject: [PATCH 02/55] Update Jenkinsfile
---
Jenkinsfile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 88af4a7c..8327e4c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,4 +7,10 @@ pipeline {
}
}
}
+
+post {
+ always {
+ archive 'dist/*.jar'
+ }
+}
}
From f7eeca94b886897f1d88feca4a91f6b41e7fdcc3 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 02:02:21 -0500
Subject: [PATCH 03/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8327e4c3..163a8885 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
post {
always {
- archive 'dist/*.jar'
+ archiveartifacts artifacts: 'dist/*.jar' fingerprint: true
}
}
}
From aaf43ec497499d8bc180f3d5c08b75e2313ee3f4 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 02:03:35 -0500
Subject: [PATCH 04/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 163a8885..3ee52830 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
post {
always {
- archiveartifacts artifacts: 'dist/*.jar' fingerprint: true
+ archiveArtifacts artifacts: 'dist/*.jar' fingerprint: true
}
}
}
From c0126dc92221f45f99e878f343b84de9877a208f Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 02:04:59 -0500
Subject: [PATCH 05/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3ee52830..d1285730 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
post {
always {
- archiveArtifacts artifacts: 'dist/*.jar' fingerprint: true
+ archiveArtifacts artifacts: 'dist/*.jar', fingerprint: true
}
}
}
From 7493f22b71fb13b8af2c1cc8ae2ce88e1c4af5f8 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 10:24:31 -0500
Subject: [PATCH 06/55] Update Jenkinsfile
---
Jenkinsfile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index d1285730..3b911ef6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,12 @@
pipeline {
agent any
stages {
+ stage ('Unit Tests') {
+ steps {
+ sh 'ant -f test.xml -v'
+ junit 'reports/result.xml'
+ }
+ }
stage ('build') {
steps{
sh 'ant -f build.xml -v'
From f5b53141c9f5be0086f4aa1592cce4fae5986259 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 10:58:44 -0500
Subject: [PATCH 07/55] Update build.xml
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 8576eabf..062d7c5b 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@
-
+
From aad93d8ae758affbe8eac853381545a4442dc69b Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 20:55:21 -0500
Subject: [PATCH 08/55] Update Jenkinsfile
---
Jenkinsfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3b911ef6..bafd7853 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
pipeline {
- agent any
+ agent {
+ label 'master'
+ }
stages {
stage ('Unit Tests') {
steps {
@@ -12,6 +14,11 @@ pipeline {
sh 'ant -f build.xml -v'
}
}
+ stage ('deploy'){
+ step {
+ sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all"
+ }
+ }
}
post {
From bba1cd706b40a3bbb1720024e08de3f117bc0dce Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 20:57:17 -0500
Subject: [PATCH 09/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bafd7853..68fd13bc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
}
}
stage ('deploy'){
- step {
+ steps {
sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all"
}
}
From 18c20942132fa6965fb519a9ea2f749816483d2d Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:17:29 -0500
Subject: [PATCH 10/55] Update Jenkinsfile
Running steps on individual nodes
---
Jenkinsfile | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 68fd13bc..caf9988a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,24 +1,40 @@
pipeline {
- agent {
- label 'master'
- }
+ agent none
stages {
stage ('Unit Tests') {
+ agent {
+ label 'apache'
+ }
steps {
sh 'ant -f test.xml -v'
junit 'reports/result.xml'
}
}
stage ('build') {
+ agent {
+ label 'apache'
+ }
steps{
sh 'ant -f build.xml -v'
}
}
stage ('deploy'){
+ agent {
+ label 'apache'
+ }
steps {
sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all"
}
}
+ stage ('Ruuning on CentOs'){
+ agent {
+ label 'CentOs'
+ }
+ steps {
+ sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
+ sh 'java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4'
+ }
+ }
}
post {
From 18e7e238c6484ca9914d8f4aaf8e66c638e9d16f Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:27:08 -0500
Subject: [PATCH 11/55] Update Jenkinsfile
---
Jenkinsfile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index caf9988a..e85c39fb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,6 +17,11 @@ pipeline {
steps{
sh 'ant -f build.xml -v'
}
+ post {
+ success {
+ archiveArtifacts artifacts: 'dist/*.jar', fingerprint: true
+ }
+}
}
stage ('deploy'){
agent {
@@ -36,10 +41,4 @@ pipeline {
}
}
}
-
-post {
- always {
- archiveArtifacts artifacts: 'dist/*.jar', fingerprint: true
- }
-}
}
From c53ef6ee1de216307f2b181bf25999f41acffc82 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:28:59 -0500
Subject: [PATCH 12/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e85c39fb..f23d6f8e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
}
steps {
sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
- sh 'java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4'
+ sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
}
From e14e511ef8f1ae9ede17445ad7bd946ae3bf453e Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:46:55 -0500
Subject: [PATCH 13/55] Update Jenkinsfile
Running on Debian which is not in our master or slave. using docker.
---
Jenkinsfile | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f23d6f8e..08230457 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,4 +41,13 @@ pipeline {
}
}
}
-}
+ stage ('Ruuning on debian'){
+ agent {
+ docker 'openjdk:8u121-jre'
+ }
+ steps {
+ sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
+ sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
+ }
+ }
+ }
From 7787d41fa4d75ac1a052323b53316d34510a08df Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:53:42 -0500
Subject: [PATCH 14/55] Update Jenkinsfile
---
Jenkinsfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 08230457..0d8cc5f4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,6 @@ pipeline {
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
- }
stage ('Ruuning on debian'){
agent {
docker 'openjdk:8u121-jre'
From f4f3574982fd79c21b561c40f6e4cfb3c68af0c5 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 21:56:04 -0500
Subject: [PATCH 15/55] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0d8cc5f4..77c80563 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,4 +49,5 @@ pipeline {
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
+ }
}
From 6f5405af9788e24a8b509a8655cf718329e110f5 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 22:10:07 -0500
Subject: [PATCH 16/55] Update Jenkinsfile
After successful functional testing moving to green
---
Jenkinsfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 77c80563..b5f84d61 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all"
}
}
- stage ('Ruuning on CentOs'){
+ stage ('Running on CentOs'){
agent {
label 'CentOs'
}
@@ -49,5 +49,10 @@ pipeline {
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
+ stage('Promote to green'){
+ steps {
+ sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green"
+ }
+ }
}
}
From e7ab9ecaec2e951a0a47351e4b75c0975656103f Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 22:10:37 -0500
Subject: [PATCH 17/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b5f84d61..04958214 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
}
stage('Promote to green'){
steps {
- sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green"
+ sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
}
}
From 7515cba5f2ec9b081673e7fb0608c80731d655f9 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 22:13:35 -0500
Subject: [PATCH 18/55] Update Jenkinsfile
---
Jenkinsfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 04958214..68d4b01d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,6 +50,9 @@ pipeline {
}
}
stage('Promote to green'){
+ agent {
+ label 'apache'
+ }
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
From c320baaaf6291fc9d5946f3bd1abbdc300d090e7 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 22:21:52 -0500
Subject: [PATCH 19/55] Update Jenkinsfile
adding the condition of the development branch.
---
Jenkinsfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 68d4b01d..1f325e75 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,6 +53,9 @@ pipeline {
agent {
label 'apache'
}
+ when {
+ branch 'development'
+ }
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
From d1519aed04082ea3abef372333e4821d5dc23fe7 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 23:18:12 -0500
Subject: [PATCH 20/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1f325e75..e550dbd3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
label 'apache'
}
when {
- branch 'development'
+ branch 'developement'
}
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
From 591f800138fec30439bd68eb443c60c3aff8113c Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 23:19:06 -0500
Subject: [PATCH 21/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1f325e75..e550dbd3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
label 'apache'
}
when {
- branch 'development'
+ branch 'developement'
}
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
From 6ad1760822be97d8d7f554be8704f33ae818a1cf Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 23:44:21 -0500
Subject: [PATCH 22/55] Update Jenkinsfile
promote Jenkins file from dev to master
---
Jenkinsfile | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e550dbd3..de65bb47 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,8 @@ pipeline {
label 'apache'
}
steps {
- sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all"
+ sh 'mkdir -p /var/www/html/rectangles/all/${env.BRANCH_NAME}'
+ sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all/${env.BRANCH_NAME}/"
}
}
stage ('Running on CentOs'){
@@ -36,7 +37,7 @@ pipeline {
label 'CentOs'
}
steps {
- sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
+ sh "wget http://cprakas011d.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar"
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
@@ -45,7 +46,7 @@ pipeline {
docker 'openjdk:8u121-jre'
}
steps {
- sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
+ sh "wget http://cprakas011d.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar"
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
@@ -54,11 +55,31 @@ pipeline {
label 'apache'
}
when {
- branch 'developement'
+ branch 'master'
}
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
}
+ stage('Promote developement to master'){
+ agent {
+ label 'apache'
+ }
+ when {
+ branch 'developement'
+ }
+ steps {
+ echo "Stash any local changes"
+ sh 'git stash'
+ echo "Checking out developement branch"
+ sh 'git checkout developement'
+ echo "Checking out the master"
+ sh 'git checkout master'
+ echo 'Merging developement to master'
+ sh 'git merge developement'
+ echo "Pusing to origin master"
+ sh 'git push origin master'
+ }
+ }
}
}
From 45b8886c470db216672986e2f45255dd9aab971f Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Mon, 22 Apr 2019 23:46:13 -0500
Subject: [PATCH 23/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index de65bb47..505bebff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
label 'apache'
}
steps {
- sh 'mkdir -p /var/www/html/rectangles/all/${env.BRANCH_NAME}'
+ sh 'mkdir /var/www/html/rectangles/all/${env.BRANCH_NAME}'
sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all/${env.BRANCH_NAME}/"
}
}
From 5959318356b80b630c3b4cd83502a6cc8f3d49ce Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 21:20:02 -0500
Subject: [PATCH 24/55] Update Jenkinsfile
correction in command
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 505bebff..3a9be1c5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
label 'apache'
}
steps {
- sh 'mkdir /var/www/html/rectangles/all/${env.BRANCH_NAME}'
+ sh "mkdir /var/www/html/rectangles/all/${env.BRANCH_NAME}"
sh "cp dist/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all/${env.BRANCH_NAME}/"
}
}
From bc488e92344c7aa4e14a6b2de9e2975774d17925 Mon Sep 17 00:00:00 2001
From: Test User
Date: Wed, 24 Apr 2019 02:41:54 +0000
Subject: [PATCH 25/55] change in echo
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3a9be1c5..5145695b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,7 +74,7 @@ pipeline {
echo "Checking out developement branch"
sh 'git checkout developement'
echo "Checking out the master"
- sh 'git checkout master'
+ sh 'git checkout master branch'
echo 'Merging developement to master'
sh 'git merge developement'
echo "Pusing to origin master"
From 5ce63a52efe122dace01aaaef80d43e51bc0baca Mon Sep 17 00:00:00 2001
From: Test User
Date: Wed, 24 Apr 2019 03:01:31 +0000
Subject: [PATCH 26/55] test
---
test.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 test.txt
diff --git a/test.txt b/test.txt
new file mode 100644
index 00000000..9daeafb9
--- /dev/null
+++ b/test.txt
@@ -0,0 +1 @@
+test
From 0a77551333f0e282aff0cd1d3740b75a5a377059 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:05:14 -0500
Subject: [PATCH 27/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e550dbd3..315cdcc9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
agent {
label 'CentOs'
}
- steps {
+ steps{
sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
From 8e22eca41cdad2bc56e740651eb06d314431dfd5 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:06:27 -0500
Subject: [PATCH 28/55] Delete test.txt
---
test.txt | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 test.txt
diff --git a/test.txt b/test.txt
deleted file mode 100644
index 9daeafb9..00000000
--- a/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
From 67fce30c7a24465bbfb5ff2f942d375763168e33 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:08:22 -0500
Subject: [PATCH 29/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5145695b..2a22da32 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,7 @@ pipeline {
archiveArtifacts artifacts: 'dist/*.jar', fingerprint: true
}
}
- }
+ }
stage ('deploy'){
agent {
label 'apache'
From 4ef00a5a8290e3aff1946c8dbbc5aafd02cfac82 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:09:48 -0500
Subject: [PATCH 30/55] Update Jenkinsfile
command corrected
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2a22da32..07274f08 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,7 +74,7 @@ pipeline {
echo "Checking out developement branch"
sh 'git checkout developement'
echo "Checking out the master"
- sh 'git checkout master branch'
+ sh 'git checkout master'
echo 'Merging developement to master'
sh 'git merge developement'
echo "Pusing to origin master"
From 5950ec55f3ed02b0700e5e2ca53681de461b0156 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:24:19 -0500
Subject: [PATCH 31/55] Update Jenkinsfile
solved conflict
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 315cdcc9..bd9c7198 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
label 'CentOs'
}
steps{
- sh "wget http://cprakas011d.mylabserver.com/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar"
+ sh "wget http://cprakas011d.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar"
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
}
@@ -54,7 +54,7 @@ pipeline {
label 'apache'
}
when {
- branch 'developement'
+ branch 'master'
}
steps {
sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
From aea6bb166a369dfc35942c2732f3dd6890368f4d Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:27:34 -0500
Subject: [PATCH 32/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bd9c7198..e8d063ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
agent {
label 'CentOs'
}
- steps{
+ steps {
sh "wget http://cprakas011d.mylabserver.com/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar"
sh "java -jar rectangle_${env.BUILD_NUMBER}.jar 3 4"
}
From e25a3d5d3a662711972f440551d388c46ef3e6a7 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:29:13 -0500
Subject: [PATCH 33/55] Create test
---
test | 1 +
1 file changed, 1 insertion(+)
create mode 100644 test
diff --git a/test b/test
new file mode 100644
index 00000000..b14df644
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+Hi
From 1bd0e7a9e3da91388758aa4173f5f2ebf1f8bcd4 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:29:54 -0500
Subject: [PATCH 34/55] Delete test
---
test | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 test
diff --git a/test b/test
deleted file mode 100644
index b14df644..00000000
--- a/test
+++ /dev/null
@@ -1 +0,0 @@
-Hi
From bccd2ad9eede4b8d97c8b660521bd8e13c042c73 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:33:08 -0500
Subject: [PATCH 35/55] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 07274f08..83eea04d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,6 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
+ echo "X"
}
}
}
From 16aa4f25dc9651f026009718e56af142aaf19694 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:37:36 -0500
Subject: [PATCH 36/55] Update Jenkinsfile
---
Jenkinsfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 83eea04d..0b55ec24 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,8 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "X"
- }
+ }
}
}
}
From 64626bfb7b1fccfb19c6cb6ad733e4bee50716df Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:37:56 -0500
Subject: [PATCH 37/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 83eea04d..6bcd85e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "X"
+ echo "Y"
}
}
}
From c24ccc160956b189abf468f54544dfad51abe10e Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:17:59 -0500
Subject: [PATCH 38/55] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6bcd85e0..f7953d73 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,6 +80,7 @@ pipeline {
echo "Pusing to origin master"
sh 'git push origin master'
echo "Y"
+ echo "X"
}
}
}
From a8048285a7eedc52014b8cbe84baa29385c0604d Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:26:18 -0500
Subject: [PATCH 39/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f7953d73..077063a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,7 +58,7 @@ pipeline {
branch 'master'
}
steps {
- sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
+ sh "cp /var/www/html/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
}
stage('Promote developement to master'){
From 27d723975879dd73eb4a5ba887708d8109a4347e Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:28:00 -0500
Subject: [PATCH 40/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6bcd85e0..968ff932 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -58,7 +58,7 @@ pipeline {
branch 'master'
}
steps {
- sh "cp /var/www/html/rectangles/all/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
+ sh "cp /var/www/html/rectangles/all/${env.BRANCH_NAME}/rectangle_${env.BUILD_NUMBER}.jar /var/www/html/rectangles/green/"
}
}
stage('Promote developement to master'){
From e502254eca9598337742d7be126c39be5453ef65 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:30:22 -0500
Subject: [PATCH 41/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 968ff932..287529e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,7 +69,7 @@ pipeline {
branch 'developement'
}
steps {
- echo "Stash any local changes"
+ echo "Stash any local changes"
sh 'git stash'
echo "Checking out developement branch"
sh 'git checkout developement'
From d7e0466656a6df2f34cf3620751c70311a37e381 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:30:52 -0500
Subject: [PATCH 42/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 077063a3..4f1c5dee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,7 +69,7 @@ pipeline {
branch 'developement'
}
steps {
- echo "Stash any local changes"
+ echo "Stash any local changes"
sh 'git stash'
echo "Checking out developement branch"
sh 'git checkout developement'
From 1c7e4ef8a29ef034ee97d9807cad97971e469ffb Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:32:03 -0500
Subject: [PATCH 43/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4f1c5dee..2a927192 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
echo "Pusing to origin master"
sh 'git push origin master'
echo "Y"
- echo "X"
+ echo "z"
}
}
}
From 7cbd16ae1ff707f27aeb717de3f183facbb61852 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:32:34 -0500
Subject: [PATCH 44/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2a927192..3733b5a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "Y"
+ echo "y"
echo "z"
}
}
From 792d46af97f118778647d8d82f040c24c6fda0b3 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:33:04 -0500
Subject: [PATCH 45/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 287529e9..31b1185c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "Y"
+ echo "y"
}
}
}
From 351f9fbb71981044c0cea54abb940f02d8d718c9 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:40:18 -0500
Subject: [PATCH 46/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 31b1185c..287529e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "y"
+ echo "Y"
}
}
}
From a20c356562e5338aaa2320b0596766c745c8f900 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:40:40 -0500
Subject: [PATCH 47/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3733b5a3..2a927192 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
sh 'git merge developement'
echo "Pusing to origin master"
sh 'git push origin master'
- echo "y"
+ echo "Y"
echo "z"
}
}
From e5063b8b3f9e171c050a9136bde17aa6d83959f7 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:57:24 -0500
Subject: [PATCH 48/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2a927192..a999edae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
echo "Pusing to origin master"
sh 'git push origin master'
echo "Y"
- echo "z"
+ echo "K"
}
}
}
From 808a2cc695849b93dc34c17edf681af34ae8b8b6 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Wed, 24 Apr 2019 00:01:55 -0500
Subject: [PATCH 49/55] Update Jenkinsfile
---
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index a999edae..f86303f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,8 +73,10 @@ pipeline {
sh 'git stash'
echo "Checking out developement branch"
sh 'git checkout developement'
+ sh 'git pull'
echo "Checking out the master"
sh 'git checkout master'
+ sh 'git pull'
echo 'Merging developement to master'
sh 'git merge developement'
echo "Pusing to origin master"
From 950d4723ad1de6c949f84009c5207a7a7c9d56f3 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Wed, 24 Apr 2019 00:07:34 -0500
Subject: [PATCH 50/55] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index f86303f8..fdd2d4f9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,6 +80,7 @@ pipeline {
echo 'Merging developement to master'
sh 'git merge developement'
echo "Pusing to origin master"
+ sh "git remote set-url origin git@github.com:temtestuser/content-jenkins-java-project.git"
sh 'git push origin master'
echo "Y"
echo "K"
From 96610b88e490ee6550293c5b60405ef2ed1a394d Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Wed, 24 Apr 2019 00:17:22 -0500
Subject: [PATCH 51/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fdd2d4f9..f0ed0142 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,7 +82,7 @@ pipeline {
echo "Pusing to origin master"
sh "git remote set-url origin git@github.com:temtestuser/content-jenkins-java-project.git"
sh 'git push origin master'
- echo "Y"
+ echo "T"
echo "K"
}
}
From f6d2668a774980a6ade819de82023d4292ab7ca7 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Wed, 24 Apr 2019 00:17:42 -0500
Subject: [PATCH 52/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index f0ed0142..7785842f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
sh "git remote set-url origin git@github.com:temtestuser/content-jenkins-java-project.git"
sh 'git push origin master'
echo "T"
- echo "K"
+ echo "X"
}
}
}
From 1df9a5034a164f323ea38ca0d9e04fb707ac121e Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Fri, 26 Apr 2019 19:19:35 -0500
Subject: [PATCH 53/55] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7785842f..2b89168b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,6 +84,7 @@ pipeline {
sh 'git push origin master'
echo "T"
echo "X"
+ echo "Hi"
}
}
}
From fa7bf8b2adf83123159931287dc02c7d56f6c46e Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Fri, 26 Apr 2019 19:21:54 -0500
Subject: [PATCH 54/55] Update Jenkinsfile
---
Jenkinsfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2b89168b..7785842f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,7 +84,6 @@ pipeline {
sh 'git push origin master'
echo "T"
echo "X"
- echo "Hi"
}
}
}
From 42fd7b7a3e731df4498879fb027ce6f885777494 Mon Sep 17 00:00:00 2001
From: temtestuser <44535823+temtestuser@users.noreply.github.com>
Date: Fri, 26 Apr 2019 20:20:23 -0500
Subject: [PATCH 55/55] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7785842f..56508ba9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
sh "git remote set-url origin git@github.com:temtestuser/content-jenkins-java-project.git"
sh 'git push origin master'
echo "T"
- echo "X"
+ echo "Hi"
}
}
}