diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-26 09:50:06 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-26 09:50:06 -0400 |
| commit | c1c6da438037580c8d4d3a85d7b93748d6c7ce3e (patch) | |
| tree | 44789c80f75dc172c1b4325dcd42fb8a156df056 | |
| parent | ea6bc61f16d7fcbf1b6d33269d690fa349722d61 (diff) | |
Apex: Fix fluorine name and patch netvirt reinstall
Temporarily pull in specific patch to fix ODL netvirt reinstall.
Change-Id: Id3ba00592e81ee0970075b34afb72f76db02d0b4
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/3rd_party_ci/download-netvirt-artifact.sh | 2 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/install-netvirt.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index 5a50e8a93..b6df5927c 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -10,7 +10,7 @@ if [ "$ODL_BRANCH" != 'master' ]; then DIST=$(echo ${ODL_BRANCH} | sed -rn 's#([a-zA-Z]+)/([a-zA-Z]+)#\2#p') ODL_BRANCH=$(echo ${ODL_BRANCH} | sed -rn 's#([a-zA-Z]+)/([a-zA-Z]+)#\1%2F\2#p') else - DIST='flourine' + DIST='fluorine' fi CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~${ODL_BRANCH}~${GERRIT_CHANGE_ID}/detail" # due to limitation with the Jenkins Gerrit Trigger, we need to use Gerrit REST API to get the change details diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index ed1a12bc8..0dcb7bfe1 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -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/3 && 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 |