diff options
| -rw-r--r-- | jjb/apex/apex.yml | 8 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 14 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 3 |
3 files changed, 17 insertions, 8 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 65f042f50..e7f166a8a 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -249,6 +249,9 @@ echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" + echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').src.rpm" + echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm" + echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties echo @@ -285,13 +288,16 @@ # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) gs://$GS_URL/$(basename $OPNFV_RPM_URL) > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) gs://$GS_URL/$(basename $OPNFV_SRPM_URL) > gsutil.iso.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 echo echo "--------------------------------------------------------" echo "Done!" - echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "ISO Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "RPM Artifact is available as http://$GS_URL/$(basename $OPNFV_RPM_URL)" ####################### diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 6268f27d2..efd6245e1 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -525,12 +525,12 @@ set +e # Remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null + docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null # Pull and store fresh image from Dockerhub - $ docker pull opnfv/functest + docker pull opnfv/functest # Run Docker and Functest tests cmd="${FUNCTEST_REPO_DIR}/docker/start.sh" @@ -632,7 +632,7 @@ set +e # cleanup: remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null + docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 192737be2..78988a76f 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -76,6 +76,7 @@ - shell: | pwd cd src + make clobber make # run basic sanity test make sanity @@ -136,6 +137,7 @@ - shell: | pwd cd src + make clobber make # run basic sanity test make sanity @@ -192,4 +194,5 @@ - shell: | pwd cd src + make clobber make |