diff --git a/Jenkinsfile b/Jenkinsfile index c11fd2e0..72f0cea1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,13 +9,11 @@ node ('hyp-x') { // trigger build on x86_64 node timestamps { try { def ROOTDIR = pwd() // workspace dir (/w/workspace/ - def nodeHome = tool 'nodejs-8.11.3' + def nodeHome = tool 'nodejs-8.11.3' // NodeJs version env.ARCH = "amd64" - env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim() - env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile - env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep "BASEIMAGE_RELEASE =" | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile - env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus - env.PROJECT_VERSION = "${VERSION}-stable" + env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/release-1.4/Makefile && cat Makefile | grep "PREV_VERSION =" | cut -d "=" -f2').trim() + env.VERSION = "$VERSION" // PREV_VERSION from fabric Makefile + env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep "BASEIMAGE_RELEASE=" | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile env.BASE_IMAGE_TAG = "${ARCH}-${BASE_IMAGE_VER}" //fabric baseimage version env.PROJECT_DIR = "gopath/src/github.com/hyperledger" env.GOPATH = "$WORKSPACE/gopath" diff --git a/scripts/Jenkins_Scripts/CI_Script.sh b/scripts/Jenkins_Scripts/CI_Script.sh index 8f1343ab..29b8bc89 100755 --- a/scripts/Jenkins_Scripts/CI_Script.sh +++ b/scripts/Jenkins_Scripts/CI_Script.sh @@ -4,11 +4,9 @@ # # SPDX-License-Identifier: Apache-2.0 # - # exit on first error export BASE_FOLDER=$WORKSPACE/gopath/src/github.com/hyperledger -export NEXUS_URL=nexus3.hyperledger.org:10001 export ORG_NAME="hyperledger/fabric" Parse_Arguments() { @@ -54,14 +52,13 @@ function clearContainers () { } function removeUnwantedImages() { + for i in $(docker images | grep none | awk '{print $3}'); do + docker rmi ${i} || true + done - for i in $(docker images | grep none | awk '{print $3}'); do - 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} || 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} || true + done } # Remove /tmp/fabric-shim @@ -115,22 +112,20 @@ pull_Thirdparty_Images() { } # pull Docker images from nexus pull_Docker_Images() { - for IMAGES in ca peer orderer tools ccenv nodeenv; do + for IMAGES in ca peer orderer tools ccenv; do echo "-----------> pull $IMAGES image" echo - docker pull $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG > /dev/null 2>&1 + docker pull $ORG_NAME-$IMAGES:$VERSION > /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 tag $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG $ORG_NAME-$IMAGES:$VERSION - docker rmi -f $NEXUS_URL/$ORG_NAME-$IMAGES:$IMAGE_TAG + docker tag $ORG_NAME-$IMAGES:$VERSION $ORG_NAME-$IMAGES done echo docker images | grep hyperledger/fabric } + # run byfn,eyfn tests byfn_eyfn_Tests() { echo diff --git a/scripts/Jenkins_Scripts/byfn_eyfn.sh b/scripts/Jenkins_Scripts/byfn_eyfn.sh index d70e197d..c7ff06f0 100755 --- a/scripts/Jenkins_Scripts/byfn_eyfn.sh +++ b/scripts/Jenkins_Scripts/byfn_eyfn.sh @@ -12,28 +12,12 @@ MARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/ echo "MARCH: $MARCH" echo "======== PULL fabric BINARIES ========" echo -# Set Nexus Snapshot URL -NEXUS_URL=https://nexus.hyperledger.org/content/repositories/snapshots/org/hyperledger/fabric/hyperledger-fabric-latest/$MARCH.latest-SNAPSHOT - -# Download the maven-metadata.xml file -curl $NEXUS_URL/maven-metadata.xml > maven-metadata.xml -if grep -q "not found in local storage of repository" "maven-metadata.xml"; then - echo "FAILED: Unable to download from $NEXUS_URL" -else - # Set latest tar file to the VERSION - VERSION=$(grep value maven-metadata.xml | sort -u | cut -d "<" -f2|cut -d ">" -f2) - # Download tar.gz file and extract it - cd $BASE_FOLDER/fabric-samples || exit - mkdir -p $BASE_FOLDER/fabric-samples/bin - curl $NEXUS_URL/hyperledger-fabric-latest-$VERSION.tar.gz | tar xz - if [ $? -ne 0 ]; then - echo -e "\033[31m FAILED to download binaries" "\033[0m" - exit 1 - fi - rm hyperledger-fabric-*.tar.gz - rm -f maven-metadata.xml - echo "Finished pulling fabric binaries..." - echo +cd $BASE_FOLDER/fabric-samples || exit +# Download fabric binaries from nexus +curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/$MARCH-$VERSION/hyperledger-fabric-$MARCH-$VERSION.tar.gz | tar xz +if [ $? -ne 0 ]; then + echo -e "\033[31m FAILED to download binaries" "\033[0m" + exit 1 fi cd $BASE_FOLDER/fabric-samples/first-network || exit @@ -41,9 +25,10 @@ export PATH=$BASE_FOLDER/fabric-samples/bin:$PATH logs() { -# Create Logs directory +# Create Docker_Container_Logs directory mkdir -p $WORKSPACE/Docker_Container_Logs +# Save logs in Logs directory for CONTAINER in ${CONTAINER_LIST[*]}; do docker logs $CONTAINER.example.com >& $WORKSPACE/Docker_Container_Logs/$CONTAINER-$1.log echo