Issue #000 feat: updated jenkinsfile and build.sh

Jenkinsfile

@@ -1,59 +1,64 @@
-#!groovy
-
 node('build-slave') {
-
-   currentBuild.result = "SUCCESS"
-   cleanWs()
-
-   try {
-
-      stage('Checkout') {
-
-         checkout scm
-      }
-
-      stage('Build') {
-
-        env.NODE_ENV = "build"
-        print "Environment will be : ${env.NODE_ENV}"
-        sh('git submodule update --init')
-        sh('git submodule update --init --recursive --remote')
-        sh 'git log -1'
-        sh 'cat service/conf/routes | grep v2'
-        sh 'sudo mvn clean install -DskipTests=true '
-
-      }
-
-      stage('Unit Tests') {
-		sh "sudo mvn test '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false"
-      }
-
-      stage('Package') {
-
-        dir ('service') {
-          sh 'mvn play2:dist'
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        ansiColor('xterm') {
+            stage('Checkout') {
+                if (!env.hub_org) {
+                    println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                    error 'Please resolve the errors and rerun..'
+                } else
+                    println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
+            }
+            cleanWs()
+            if (params.github_release_tag == "") {
+                checkout scm
+                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+                branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim()
+                build_tag = branch_name + "_" + commit_hash
+                println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL)
+            } else {
+                def scmVars = checkout scm
+                checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]]
+                build_tag = params.github_release_tag
+                println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL)
+            }
+            echo "build_tag: " + build_tag
+
+            stage('Build') {
+                env.NODE_ENV = "build"
+                print "Environment will be : ${env.NODE_ENV}"
+                sh('git submodule update --init')
+                sh('git submodule update --init --recursive --remote')
+                sh 'git log -1'
+                sh 'cat service/conf/routes | grep v2'
+                sh 'mvn clean install -DskipTests=true '
+
+            }
+
+            stage('Unit Tests') {
+                sh "mvn test '-Dtest=!%regex[io.opensaber.registry.client.*]' -DfailIfNoTests=false"
+            }
+
+            stage('Package') {
+                dir('service') {
+                    sh 'mvn play2:dist'
+                }
+                sh('chmod 777 ./build.sh')
+                sh("./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
+            }
+            stage('ArchiveArtifacts') {
+                archiveArtifacts "metadata.json"
+                currentBuild.description = "${build_tag}"
+            }
         }
-        sh('chmod 777 ./build.sh')
-        sh('./build.sh')
-
-      }
-
-      stage('Publish') {
-
-        echo 'Push to Repo'
-        sh 'ls -al ~/'
-        sh('chmod 777 ./dockerPushToRepo.sh')
-        sh 'ARTIFACT_LABEL=bronze ./dockerPushToRepo.sh'
-        sh './metadata.sh > metadata.json'
-        sh 'cat metadata.json'
-        archive includes: "metadata.json"
-
-      }
-
     }
     catch (err) {
         currentBuild.result = "FAILURE"
         throw err
     }
-
 }

build.sh

@@ -1,14 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 # Build script
-# set -o errexit
-e () {
-    echo $( echo ${1} | jq ".${2}" | sed 's/\"//g')
-}
-m=$(./metadata.sh)
+set -o pipefail
 
-org=$(e "${m}" "org")
-name=$(e "${m}" "name")
-version=$(e "${m}" "version")
+build_tag=$1
+name=learner_service
+node=$2
+org=$3
 
-
-docker build -f ./Dockerfile -t ${org}/${name}:${version}-bronze .
+docker build -f ./Dockerfile --label commitHash=$(git rev-parse --short HEAD) -t ${org}/${name}:${build_tag} .
+echo {\"image_name\" : \"${name}\", \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json