From fa27ac0bb28389db4c5e00e68b5f81a24a2d5d89 Mon Sep 17 00:00:00 2001
From: Sebastien <seb6596@gmail.com>
Date: Wed, 7 Mar 2018 15:52:18 +0100
Subject: [PATCH] Test jenkinsfile edit

---
 Jenkinsfile | 96 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e2a1a57..2e1f4b4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,52 +1,56 @@
-node {
-    def app
-   stage('Clone') { // for display purposes
-      	// Get some code from a GitHub repository
-      	echo env.BRANCH_NAME
-		script {
-	        if (env.BRANCH_NAME == 'master') {
-	                git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'master' 
-	        } else {
-	               git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'devel' 
-	        }
-	    }
+pipeline {
+    agent any
+    stages {
+        def app
+        stage('Clone') { // for display purposes
+            // Get some code from a GitHub repository
+            echo env.BRANCH_NAME
+            script {
+                if (env.BRANCH_NAME == 'master') {
+                    git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'master'
+                } else {
+                    git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'devel'
+                }
+            }
 
-   }
-   stage('Gradle Build'){
-        script {
-            if (env.BRANCH_NAME == 'master') {
+        }
+        stage('Gradle Build'){
+            script {
+                if (env.BRANCH_NAME == 'master') {
                     build job: 'Bot Discord Gradle', wait: true
-            } else {
-                   build job: 'Bot Discord Gradle devel', wait: true
+                } else {
+                    build job: 'Bot Discord Gradle devel', wait: true
+                }
             }
         }
-   }
-   stage('Build Docker image') {
-        /* This builds the actual image; synonymous to
-         * docker build on the command line */
+        stage('Build Docker image') {
+            /* This builds the actual image; synonymous to
+             * docker build on the command line */
 
-        app = docker.build("brokenfire/brokendiscordbot",'--build-arg BUILD_NBR=${BUILD_NUMBER} --build-arg BRANCH_NAME=${BRANCH_NAME} --rm=true .')
+            app = docker.build("brokenfire/brokendiscordbot",'--build-arg BUILD_NBR=${BUILD_NUMBER} --build-arg BRANCH_NAME=${BRANCH_NAME} --rm=true .')
+        }
+        stage('Push Docker image') {
+            /* Finally, we'll push the image with two tags:
+             * First, the incremental build number from Jenkins
+             * Second, the 'latest' tag.
+             * Pushing multiple tags is cheap, as all the layers are reused. */
+            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'docker-hub-credentials', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+                sh 'docker login -u $USERNAME -p $PASSWORD'
+                script {
+                    if (env.BRANCH_NAME == 'master') {
+                        app.push()
+                    } else {
+                        app.push("devel")
+                    }
+                }
+            }
+
+
+
+        }
+        stage('Cleaning'){
+            sh "docker image prune -f"
+        }
     }
-   stage('Push Docker image') {
-        /* Finally, we'll push the image with two tags:
-         * First, the incremental build number from Jenkins
-         * Second, the 'latest' tag.
-         * Pushing multiple tags is cheap, as all the layers are reused. */
-         withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'docker-hub-credentials', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-	     sh 'docker login -u $USERNAME -p $PASSWORD'
-             script {
-		    if (env.BRANCH_NAME == 'master') {
-			    app.push()
-		    } else {
-			    app.push("devel")
-		    }
-       	    }
-         }
-        
-        
-        
-    }
-    stage('Cleaning'){
-        sh "docker image prune -f"
-    }
-} 
+}
+