FABN-1093 Update Jenkinsfile.z

This patch updates Jenkinsfile.z to remove pulling docker images from nexus repository. Change-Id: Ic497b92a9553e7853b12525ca4385c4cd7a28657 Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
hyperledger · Jan 9, 2019 · ee39b92 · ee39b92
1 parent a8d4c2b
commit ee39b92
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 60 deletions.
diff --git a/Jenkinsfile.z b/Jenkinsfile.z
@@ -9,12 +9,7 @@ node('hyp-z') {
 
      def ROOTDIR = pwd() // workspace dir (/w/workspace/<job_name>
      env.NODE_VER = "8.14.0"
-     // Fetch the BASE_VERSION from fabric master branch to pull images from nexus
-     env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/release-1.4/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim()
-     env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile
      env.ARCH = "s390x" // `uname -m`
-     env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus3
-     env.PROJECT_VERSION = "${VERSION}-stable"
      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:~/npm/bin:/home/jenkins/.nvm/versions/node/v${NODE_VER}/bin:$PATH"
@@ -72,22 +67,6 @@ node('hyp-z') {
       }
       }
 
-// Pull fabric, fabric-ca Docker Images
-      stage("Pull Docker Images") {
-         wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {
-           try {
-                 dir("${ROOTDIR}/$PROJECT_DIR/fabric-sdk-node/scripts/Jenkins_Scripts") {
-                 sh './CI_Script.sh --pull_Docker_Images'
-                 }
-               }
-           catch (err) {
-                 failure_stage = "Pull docker images"
-                 currentBuild.result = 'FAILURE'
-                 throw err
-           }
-         }
-      }
-
 // Run gulp tests (headless and integration tests)
       stage("Headless & IntegrationTests") {
          wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'xterm']) {

diff --git a/scripts/Jenkins_Scripts/CI_Script.sh b/scripts/Jenkins_Scripts/CI_Script.sh
@@ -39,9 +39,6 @@ Parse_Arguments() {
                       --env_Info)
                             env_Info
                             ;;
-                      --pull_Docker_Images)
-                            pull_Docker_Images
-                            ;;
                       --clean_Environment)
                             clean_Environment
                             ;;
@@ -124,42 +121,6 @@ env_Info() {
         docker images
 }
 
-# pull fabric, fabric-ca images from nexus
-pull_Docker_Images() {
-            for IMAGES in peer orderer ca javaenv; do
-                 if [ $IMAGES == "javaenv" ]; then
-                       if [ $ARCH == "s390x" ]; then
-                             # Do not pull javaenv if OS_VER == s390x
-                             echo "\033[32m -----------> skipping pull of javaenv image on s390x" "\033[0m"
-                       else
-                             # Pull javaenv at same level as node SDK
-                             echo "\033[32m -----------> pull $ORG_NAME-$IMAGES:${IMAGE_TAG} image" "\033[0m"
-                             echo
-                             docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:${IMAGE_TAG} > /dev/null 2>&1
-                             if [ $? -ne 0 ]; then
-                                   echo -e "\033[31m FAILED to pull docker images" "\033[0m"
-                                   exit 1
-                             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 rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:${IMAGE_TAG}
-                       fi
-                 else
-                       echo "-----------> pull $IMAGES image"
-                       echo
-                       docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:${IMAGE_TAG} > /dev/null 2>&1
-                             if [ $? -ne 0 ]; then
-                                   echo -e "\033[31m FAILED to pull docker images" "\033[0m"
-                                   exit 1
-                             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 rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:${IMAGE_TAG}
-                 fi
-            done
-                 echo
-                 docker images | grep hyperledger/fabric
-}
 # Install NPM
 install_Npm() {