diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-26 15:17:12 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-06-26 15:17:12 -0400 |
| commit | 0f9c8ced437af4cae8b25387142bec5d42fab138 (patch) | |
| tree | 057ae05382a03da4dd10c19acf4f0faa55895845 | |
| parent | 65bd1d62eeb94c3519d551925fecda902ab1e335 (diff) | |
Apex: Fixes to allow ODL snapshot update to work
Change-Id: I2e641434051e615cf04922a7349c7a7f1891caea
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/3rd_party_ci/install-netvirt.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex-snapshot-deploy.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index 0dcb7bfe1..07bbe7739 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -26,7 +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 -git fetch https://gerrit.opnfv.org/gerrit/sdnvpn refs/changes/17/59017/3 && git checkout FETCH_HEAD +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 diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index 1810a0036..0760626e3 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -133,6 +133,10 @@ for node_def in ${virsh_vm_defs}; do sudo virsh define ${node_def} node=$(echo ${node_def} | awk -F '.' '{print $1}') sudo cp -f ${node}.qcow2 /var/lib/libvirt/images/ + # FIXME (trozet) install java on each disk image as required to upgrade ODL + # should be added to Apex as part of the deployment. Remove this after that + # is complete + sudo LIBGUESTFS_BACKEND=direct virt-customize --install java-1.8.0-openjdk -a /var/lib/libvirt/images/${node}.qcow2 sudo virsh start ${node} echo "Node: ${node} started" done |