FAB-13433 - Update Jenkinsfile configuration

This change is to update Jenkinsfile to fetch
the patchset for verify jobs and clone the latest
commit for merge jobs.

Change-Id: I20f9a322eb9f60b648b4b630df2d4565223be916
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>

Jenkinsfile

@@ -20,18 +20,35 @@ node ('hyp-x') { // trigger build on x86_64 node
     env.PROJECT_DIR = "gopath/src/github.com/hyperledger"
     env.GOPATH = "$WORKSPACE/gopath"
     env.PATH = "$GOPATH/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:${nodeHome}/bin:$PATH"
-
+    def jobname = sh(returnStdout: true, script: 'echo ${JOB_NAME} | grep -q "verify" && echo patchset || echo merge').trim()
     def failure_stage = "none"
     // delete working directory
     deleteDir()
       stage("Fetch Patchset") { // fetch gerrit refspec on latest commit
           try {
-              dir("${ROOTDIR}"){
+             if (jobname == "patchset")  {
+                   println "$GERRIT_REFSPEC"
+                   println "$GERRIT_BRANCH"
+                   checkout([
+                       $class: 'GitSCM',
+                       branches: [[name: '$GERRIT_REFSPEC']],
+                       extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'gopath/src/github.com/hyperledger/$PROJECT'], [$class: 'CheckoutOption', timeout: 10]],
+                       userRemoteConfigs: [[credentialsId: 'hyperledger-jobbuilder', name: 'origin', refspec: '$GERRIT_REFSPEC:$GERRIT_REFSPEC', url: '$GIT_BASE']]])
+              } else {
+                   // Clone fabric-samples on merge
+                   println "Clone $PROJECT repository"
+                   checkout([
+                       $class: 'GitSCM',
+                       branches: [[name: 'refs/heads/$GERRIT_BRANCH']],
+                       extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'gopath/src/github.com/hyperledger/$PROJECT']],
+                       userRemoteConfigs: [[credentialsId: 'hyperledger-jobbuilder', name: 'origin', refspec: '+refs/heads/$GERRIT_BRANCH:refs/remotes/origin/$GERRIT_BRANCH', url: '$GIT_BASE']]])
+              }
+              dir("${ROOTDIR}/$PROJECT_DIR/$PROJECT") {
               sh '''
-                 [ -e gopath/src/github.com/hyperledger/fabric-samples ] || mkdir -p $PROJECT_DIR
+                 # Print last two commit details
-                 cd $PROJECT_DIR
+                 echo
-                 git clone git://cloud.hyperledger.org/mirror/fabric-samples && cd fabric-samples
+                 git log -n2 --pretty=oneline --abbrev-commit
-                 git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD
+                 echo
               '''
               }
           }
@@ -40,7 +57,7 @@ node ('hyp-x') { // trigger build on x86_64 node
                  currentBuild.result = 'FAILURE'
                  throw err
            }
-         }
+}
       // clean environment and get env data
       stage("Clean Environment - Get Env Info") {
            try {
@@ -56,7 +73,7 @@ node ('hyp-x') { // trigger build on x86_64 node
          }
 
     // Pull Third_party Images
-      stage("Pull third_party images") {
+      stage("Pull third_party Images") {
          // making the output color coded
          wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
            try {
@@ -73,7 +90,7 @@ node ('hyp-x') { // trigger build on x86_64 node
       }
 
       // Pull Fabric, fabric-ca Images
-      stage("Pull Docker images") {
+      stage("Pull Docker Images") {
          // making the output color coded
          wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
            try {
@@ -126,13 +143,13 @@ node ('hyp-x') { // trigger build on x86_64 node
            // Archive the artifacts
            archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log'
            // Sends notification to Rocket.Chat jenkins-robot channel
-           if (env.JOB_NAME == "fabric-samples-merge-byfn") {
+           if (env.JOB_NAME == "fabric-samples-merge-job") {
               if (currentBuild.result == 'FAILURE') { // Other values: SUCCESS, UNSTABLE
                rocketSend message: "Build Notification - STATUS: *${currentBuild.result}* - BRANCH: *${env.GERRIT_BRANCH}* - PROJECT: *${env.PROJECT}* - (<${env.BUILD_URL}|Open>)"
               }
            }
         }
-// End Try block
+// End Timestamps block
   }
 // End Node block
 }

scripts/Jenkins_Scripts/CI_Script.sh

@@ -56,11 +56,11 @@ function clearContainers () {
 function removeUnwantedImages() {
 
         for i in $(docker images | grep none | awk '{print $3}'); do
-                docker rmi ${i};
+                docker rmi ${i} || true
         done
 
         for i in $(docker images | grep -vE ".*baseimage.*(0.4.13|0.4.14)" | grep -vE ".*baseos.*(0.4.13|0.4.14)" | grep -vE ".*couchdb.*(0.4.13|0.4.14)" | grep -vE ".*zoo.*(0.4.13|0.4.14)" | grep -vE ".*kafka.*(0.4.13|0.4.14)" | grep -v "REPOSITORY" | awk '{print $1":" $2}'); do
-                docker rmi ${i};
+                docker rmi ${i} || true
         done
 }
 
@@ -96,10 +96,10 @@ env_Info() {
 	pgrep -a docker
 }
 
-# Pull Thirdparty Docker images (Kafka, couchdb, zookeeper)
+# Pull Thirdparty Docker images (kafka, couchdb, zookeeper baseos)
 pull_Thirdparty_Images() {
             echo "------> BASE_IMAGE_TAG:" $BASE_IMAGE_TAG
-            for IMAGES in kafka couchdb zookeeper; do
+            for IMAGES in kafka couchdb zookeeper baseos; do
                  echo "-----------> Pull $IMAGES image"
                  echo
                  docker pull $ORG_NAME-$IMAGES:${BASE_IMAGE_TAG} > /dev/null 2>&1
@@ -108,6 +108,7 @@ pull_Thirdparty_Images() {
                        exit 1
                  fi
                  docker tag $ORG_NAME-$IMAGES:${BASE_IMAGE_TAG} $ORG_NAME-$IMAGES
+                 docker tag $ORG_NAME-$IMAGES:${BASE_IMAGE_TAG} $ORG_NAME-$IMAGES:$VERSION
             done
                  echo
                  docker images | grep hyperledger/fabric
@@ -115,7 +116,7 @@ pull_Thirdparty_Images() {
 # pull fabric images from nexus
 pull_Docker_Images() {
             pull_Fabric_CA_Image
-            for IMAGES in peer orderer tools ccenv; do
+            for IMAGES in peer orderer tools ccenv nodeenv; do
                  echo "-----------> pull $IMAGES image"
                  echo
                  docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG > /dev/null 2>&1
@@ -125,6 +126,7 @@ pull_Docker_Images() {
                  fi
                  docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG $ORG_NAME-$IMAGES
                  docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG $ORG_NAME-$IMAGES:$ARCH-$VERSION
+                 docker tag $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG $ORG_NAME-$IMAGES:$VERSION
                  docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG
             done
                  echo