From 45bc676d7f90bee0e840a6b7a25beb78acef3942 Mon Sep 17 00:00:00 2001
From: root <root@ip-10-0-1-87.ec2.internal>
Date: Wed, 29 Jul 2020 11:19:06 -0400
Subject: [PATCH 1/4] changed agent

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3ab2414..043fb4b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,8 @@
 pipeline {
-  agent any
+  agent {
+    label 'master'
+  }
+
   environment {
     MAJOR_VERSION = 1
   }

From 6583a8bb3e193b0e87fab7f65648903497fe547d Mon Sep 17 00:00:00 2001
From: root <root@ip-10-0-1-87.ec2.internal>
Date: Wed, 29 Jul 2020 11:28:12 -0400
Subject: [PATCH 2/4] test centos and debian containers

---
 Jenkinsfile | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 043fb4b..e33b55b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,19 +1,26 @@
 pipeline {
-  agent {
-    label 'master'
-  }
+  agent none
 
   environment {
     MAJOR_VERSION = 1
   }
   stages {
     stage('Unit Tests') {
+      agent {
+        label 'master'
+      }
+
       steps {
         sh 'ant -f test.xml -v'
         junit 'reports/result.xml'
       }
     }
+
     stage('build') {
+      agent {
+        label 'master'
+      } 
+
       steps {
         sh 'ant -f build.xml -v'
       }
@@ -23,10 +30,37 @@ pipeline {
         }
       }
     }
+
     stage('publish') {
+      agent {
+        label 'master'
+      } 
+
       steps {
         sh "cp dist/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar /var/www/html/rectangles/all/"
       }
     }
+
+    stage('run on debian'){
+      agent{
+        docker 'openjdk:8u121-jre'
+      }
+
+      steps{
+        sh "curl $JENKINS_IP/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
+        sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
+      }
+    }
+
+    stage('run on centos'){
+      agent{
+        docker 'fabric8/java-centos-openjdk8-jdk:1.4.0'
+      }
+
+      steps{
+        sh "curl $JENKINS_IP/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
+        sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
+      }
+    }
   }
 }

From 7e87184f0b74a6d050937e875c159b25c4cdc653 Mon Sep 17 00:00:00 2001
From: root <root@ip-10-0-1-87.ec2.internal>
Date: Wed, 29 Jul 2020 11:36:40 -0400
Subject: [PATCH 3/4] test centos and debian containers v2

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e33b55b..de29384 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,7 +43,7 @@ pipeline {
 
     stage('run on debian'){
       agent{
-        docker 'openjdk:8u121-jre'
+        docker 'openjdk:8u252-jre'
       }
 
       steps{

From ade949f0f653ffe6aa0182594dcff1f92f39578c Mon Sep 17 00:00:00 2001
From: Archelle Batiller <archelle.batiller@gmail.com>
Date: Thu, 30 Jul 2020 00:10:58 +0800
Subject: [PATCH 4/4] changed ip

---
 Jenkinsfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index de29384..5642643 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,26 +41,28 @@ pipeline {
       }
     }
 
-    stage('run on debian'){
+    stage('run on centos'){
       agent{
-        docker 'openjdk:8u252-jre'
+        docker 'fabric8/java-centos-openjdk8-jdk:1.4.0'
       }
 
       steps{
-        sh "curl $JENKINS_IP/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
+        sh "curl http://18.140.113.66/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
         sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
       }
     }
 
-    stage('run on centos'){
+    stage('run on debian'){
       agent{
-        docker 'fabric8/java-centos-openjdk8-jdk:1.4.0'
+        docker 'openjdk:8u252-jre'
       }
 
       steps{
-        sh "curl $JENKINS_IP/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
+        sh "curl http://18.140.113.66/rectangles/all/rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar -o rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar"
         sh "java -jar rectangle_${env.MAJOR_VERSION}.${env.BUILD_NUMBER}.jar 3 4"
       }
     }
+
+
   }
 }