diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-04-01 16:00:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-01 16:00:17 +0000 |
| commit | 9454e1dd13d63b8328249be3dca7e17eea73128e (patch) | |
| tree | 130dedd4ea5756c79e4241298e137d92ef3e03de /jjb/cperf/cperf-ci-jobs.yml | |
| parent | eb09f71f1f8b730bdd3bc8c06cfceb3e2d3eab2c (diff) | |
| parent | 9af55515c5d2b29b637df5ee3edbe1b388575781 (diff) | |
Merge "Dial in docker and ssh environment"
Diffstat (limited to 'jjb/cperf/cperf-ci-jobs.yml')
| -rw-r--r-- | jjb/cperf/cperf-ci-jobs.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml index 6cd4e22dc..f6e068530 100644 --- a/jjb/cperf/cperf-ci-jobs.yml +++ b/jjb/cperf/cperf-ci-jobs.yml @@ -126,18 +126,20 @@ undercloud_mac=$(sudo virsh domiflist undercloud | grep default | \ grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") INSTALLER_IP=$(/usr/sbin/arp -e | grep ${undercloud_mac} | awk {'print $1'}) + sudo scp -o StrictHostKeyChecking=no root@$INSTALLER_IP:/home/stack/overcloudrc /tmp/overcloudrc sudo chmod 755 /tmp/overcloudrc source /tmp/overcloudrc # robot suites need the ssh key to log in to controller nodes, so throwing it # in tmp, and mounting /tmp as $HOME as far as robot is concerned - sudo mkdir -p /tmp/.ssh + sudo rm -rf /tmp/.ssh + sudo mkdir /tmp/.ssh + sudo chmod 0700 /tmp/.ssh sudo scp -o StrictHostKeyChecking=no root@$INSTALLER_IP:/home/stack/.ssh/id_rsa /tmp/.ssh/ sudo chown -R jenkins-ci:jenkins-ci /tmp/.ssh # done with sudo. jenkins-ci is the user from this point - sudo mv /tmp/.ssh/id_rsa ~jenkins-ci/.ssh/ - chmod -R 0600 ~jenkins-ci/.ssh + chmod 0600 /tmp/.ssh/id_rsa # cbench requires the openflow drop test feature to be installed. sshpass -p karaf ssh -o StrictHostKeyChecking=no \ @@ -148,7 +150,7 @@ docker pull opnfv/cperf:$DOCKER_TAG - robot_cmd="pybot -e exclude -L TRACE \ + robot_cmd="pybot -e exclude -L TRACE -d /tmp \ -v ODL_SYSTEM_1_IP:${SDN_CONTROLLER_IP} \ -v ODL_SYSTEM_IP:${SDN_CONTROLLER_IP} \ -v BUNDLEFOLDER:/opt/opendaylight \ @@ -160,7 +162,7 @@ -v of_port:6653" robot_suite="/home/opnfv/repos/odl_test/csit/suites/openflowplugin/Performance/010_Cbench.robot" - docker run -v /tmp:/tmp opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite} + docker run -ti -v /tmp:/tmp opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite} - builder: name: cperf-cleanup |