X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2F3rd_party_ci%2Finstall-netvirt.sh;h=232d60e5c1c2df954571befd4be7d0bae09fbd45;hb=f7df2d437f5b4b15d3c374da4d24b137cc672916;hp=ed1a12bc82f0adf834301e9f73c0c80131368b2f;hpb=f38fb4b3f155558f48c03e36fd1671a29766b266;p=releng.git diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index ed1a12bc8..232d60e5c 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -3,7 +3,7 @@ set -o errexit set -o nounset set -o pipefail -SNAP_CACHE=$HOME/snap_cache +SNAP_CACHE=$HOME/snap_cache/$OS_VERSION/$TOPOLOGY # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn @@ -26,8 +26,7 @@ fi # but we really should check the cache here, and not use a single cache folder # for when we support multiple jobs on a single slave pushd sdnvpn/odl-pipeline/lib > /dev/null -# FIXME (trozet) remove this once permissions are fixed in sdnvpn repo -chmod +x odl_reinstaller.sh +git fetch https://gerrit.opnfv.org/gerrit/sdnvpn refs/changes/17/59017/5 && git checkout FETCH_HEAD ./odl_reinstaller.sh --pod-config ${SNAP_CACHE}/node.yaml \ --odl-artifact /tmp/${NETVIRT_ARTIFACT} --ssh-key-file ${SNAP_CACHE}/id_rsa popd > /dev/null