From de0b32bfd38d49fa2a329f48c33b11bd8aac6a22 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Tue, 12 Jun 2018 17:00:04 -0700 Subject: Run ODL CSIT on Apex from Cperf container This patch adds the ability to deploy a cperf container and execute ODL csit against an OPNFV deployment with ODL. The cperf job to execute csit requires an RC file, SSH key to access OPNFV nodes, and a yaml descriptor file that contains per node information about each control/compute node. This patch also adds triggering the cperf CSIT job inside of the 3rd party ODL netvirt verification suite. That job uses Apex snapshots to bring up deployment (no undercloud). Additionally this patch includes some changes to allow multi version snapshots to work. Multiple snapshots are now being created for different OpenStack branches along with noha or HA type topologies. This patch includes the ability to detect the desired scenario as triggered by ODL Netvirt gerrit. Now in ODL netvirt gerrit a user may provide: "check-opnfv -" style syntax to initiate 3rd Party OPNFV CI on a particular OS version/HA setup. Change-Id: I51a27545c985ce74c1c72fe0933eb451939a8c05 Signed-off-by: Jamo Luhrsen Signed-off-by: Tim Rozet Signed-off-by: Jamo Luhrsen --- jjb/apex/apex-snapshot-deploy.sh | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'jjb/apex/apex-snapshot-deploy.sh') diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index 0a475062c..9738ecb19 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -25,27 +25,7 @@ pushd ci > /dev/null sudo opnfv-clean popd > /dev/null -echo "Detecting requested OpenStack branch and topology type in gerrit comment" -parsed_comment=$(echo $GERRIT_EVENT_COMMENT_TEXT | sed -n 's/^opnfv-check\s*//p') -parsed_comment=$(echo $parsed_comment | sed -n 's/\s*$//p') -if [ ! -z "$parsed_comment" ]; then - if echo $parsed_comment | grep -E '^[a-z]+-(no)?ha'; then - IFS='-' read -r -a array <<< "$parsed_comment" - os_version=${array[0]} - topo=${array[1]} - echo "OS version detected in gerrit comment: ${os_version}" - echo "Topology type detected in gerrit comment: ${topo}" - else - echo "Invalid format given for scenario in gerrit comment: ${parsed_comment}...aborting" - exit 1 - fi -else - echo "No scenario given in gerrit comment, will use default (master OpenStack, noha)" - os_version='master' - topo='noha' -fi - -full_snap_url=http://$GS_URL/${os_version}/${topo} +full_snap_url=http://$GS_URL/${OS_VERSION}/${TOPOLOGY} echo "Downloading latest snapshot properties file" if ! wget -O $WORKSPACE/opnfv.properties ${full_snap_url}/snapshot.properties; then @@ -61,7 +41,7 @@ if [ -z "$latest_snap_checksum" ]; then fi local_snap_checksum="" -SNAP_CACHE=${SNAP_CACHE}/${os_version}/${topo} +SNAP_CACHE=${SNAP_CACHE}/${OS_VERSION}/${TOPOLOGY} # check snap cache directory exists # if snapshot cache exists, find the checksum -- cgit 1.2.3-korg