X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-build-kolla-image.sh;h=0441ea159ecb406513b8d5deec09c9988e6fd741;hb=c8e2e16478a2b3deb06bb0182fda0ba3c03f1e80;hp=d080df553de1e13368c77b621a4b205f187dd3d8;hpb=598c2f7deafede33d3d0190632dce4d4ab6de246;p=releng.git

diff --git a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh b/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh
index d080df553..0441ea159 100755
--- a/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh
+++ b/jjb/daisy4nfv/daisy4nfv-build-kolla-image.sh
@@ -14,35 +14,9 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-importkey () {
-    # clone releng repository
-    echo "Cloning releng repository..."
-    [ -d releng ] && rm -rf releng
-    git clone https://gerrit.opnfv.org/gerrit/releng ./releng/ &> /dev/null
-    #this is where we import the siging key
-    if [ -f ./releng/utils/gpg_import_key.sh ]; then
-        source ./releng/utils/gpg_import_key.sh
-    fi
-}
-
 upload_image_to_opnfv () {
     image=$1
 
-    importkey
-    if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then
-        echo "Signing Key avaliable"
-        SIGN_ARTIFACT="true"
-    fi
-
-    if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then
-        gpg2 -vvv --batch --yes --no-tty \
-            --default-key opnfv-helpdesk@rt.linuxfoundation.org  \
-            --passphrase besteffort \
-            --detach-sig $image
-        gsutil cp $image.sig gs://$GS_URL/upstream/$image.sig
-        echo "Image signature upload complete!"
-    fi
-
     sha512sum -b $image > $image.sha512sum
     gsutil cp $image.sha512sum gs://$GS_URL/upstream/$image.sha512sum
 
@@ -74,11 +48,21 @@ mkdir -p docker_build_dir
 
 # -j is for deciding which branch will be used when building,
 # only for OPNFV
-./ci/kolla-build.sh -j $JOB_NAME -w $WORKSPACE/docker_build_dir
+sudo -E ./ci/kolla-build.sh -j $JOB_NAME -w $WORKSPACE/docker_build_dir
+
+if [ $? -ne 0 ]; then
+    echo
+    echo "Kolla build failed!"
+    deploy_ret=1
+else
+    echo
+    echo "--------------------------------------------------------"
+    echo "Kolla build done!"
+fi
 
 image=$(ls $WORKSPACE/docker_build_dir/kolla-build-output/kolla-image-*.tgz)
 upload_image_to_opnfv $image
 
 echo
 echo "--------------------------------------------------------"
-echo "Done!"
+echo "All done!"