From 85e1fd45a18dd9274827105ab5a2ec7e13d141f3 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 10 Feb 2017 17:05:00 -0500 Subject: Apex,CSIT: Fixes slaves and other bugs Changes Include: - Fixes phase jobs to run on the same node - Removes using WORKSPACE/.tmp dir for unpacking snapshot since other phase jobs will need access to these files. Now just unpacks to cache directory - Fixes download for ODL. The previous way ODL was being downloaded was only if a manual patch-set job was run on the ODL gerrit. This patch changes the download to use the zip artifact automatically produced. - The zip artifact is converted to tar.gz and stored in /tmp/ for the install job to consume. Note: the conversion is done because the odl-pipeline install scripts only currently accept tar.gz. - Extra checks in install job to make sure required files exist and have been previously unpacked by deploy job. Change-Id: I38aad98cac247eb4af2839811388b119079bc7ba Signed-off-by: Tim Rozet --- jjb/3rd_party_ci/download-netvirt-artifact.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'jjb/3rd_party_ci/download-netvirt-artifact.sh') diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index fe8066cb8..88456e9ee 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -6,17 +6,23 @@ set -o pipefail echo "Attempting to fetch the artifact location from ODL Jenkins" CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~master~$GERRIT_CHANGE_ID/detail" # due to limitation with the Jenkins Gerrit Trigger, we need to use Gerrit REST API to get the change details -ODL_JOB_URL=$(curl -s $CHANGE_DETAILS_URL | grep netvirt-patch-test-current-carbon | tail -1 | \ - sed 's/\\n//g' | awk '{print $6}') -NETVIRT_ARTIFACT_URL="${ODL_JOB_URL}org.opendaylight.integration\$distribution-karaf/artifact/org.opendaylight.integration/distribution-karaf/0.6.0-SNAPSHOT/distribution-karaf-0.6.0-SNAPSHOT.tar.gz" +ODL_BUILD_JOB_NUM=$(curl -s $CHANGE_DETAILS_URL | grep -Eo 'netvirt-distribution-check-carbon/[0-9]+' | tail -1 | grep -Eo [0-9]+) + +NETVIRT_ARTIFACT_URL="https://jenkins.opendaylight.org/releng/job/netvirt-distribution-check-carbon/${ODL_BUILD_JOB_NUM}/artifact/distribution-karaf-0.6.0-SNAPSHOT.zip" echo -e "URL to artifact is\n\t$NETVIRT_ARTIFACT_URL" echo "Downloading the artifact. This could take time..." -wget -q -O $NETVIRT_ARTIFACT $NETVIRT_ARTIFACT_URL +wget -q -O distribution-karaf-0.6.0-SNAPSHOT.zip $NETVIRT_ARTIFACT_URL if [[ $? -ne 0 ]]; then echo "The artifact does not exist! Probably removed due to ODL Jenkins artifact retention policy." echo "Rerun netvirt-patch-test-current-carbon to get artifact rebuilt." exit 1 fi + +#TODO(trozet) remove this once odl-pipeline accepts zip files +echo "Converting artifact zip to tar.gz" +sudo pip3 install ruamel.zip2tar +zip2tar distribution-karaf-0.6.0-SNAPSHOT.zip --gz --tar-file-name /tmp/${NETVIRT_ARTIFACT} + echo "Download complete" -ls -al $NETVIRT_ARTIFACT +ls -al /tmp/${NETVIRT_ARTIFACT} -- cgit 1.2.3-korg