diff options
Diffstat (limited to 'jjb/daisy4nfv')
| -rwxr-xr-x | jjb/daisy4nfv/daisy-deploy.sh | 7 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-build.sh | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index b303c2c05..b512e3f60 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -22,9 +22,12 @@ cd $WORKSPACE BASE_DIR=$(cd ./;pwd) echo "Cloning securedlab repo $BRANCH" -git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \ +git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \ --branch $BRANCH +# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir +cp -r securedlab/labs . + DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \ -l $LAB_NAME -p $POD_NAME -B $BRIDGE" @@ -45,7 +48,7 @@ $DEPLOY_COMMAND """ # start the deployment -#$DEPLOY_COMMAND +$DEPLOY_COMMAND if [ $? -ne 0 ]; then echo diff --git a/jjb/daisy4nfv/daisy4nfv-build.sh b/jjb/daisy4nfv/daisy4nfv-build.sh index eb29fed72..375d80733 100755 --- a/jjb/daisy4nfv/daisy4nfv-build.sh +++ b/jjb/daisy4nfv/daisy4nfv-build.sh @@ -26,6 +26,7 @@ cd $WORKSPACE echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin" + echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $OUTPUT_DIR/opnfv-$OPNFV_ARTIFACT_VERSION.bin | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties |