From bb2ee5a541150cf1034b17fc7c4828bca472ecd0 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Wed, 29 Mar 2017 15:53:52 -0700 Subject: [PATCH] Modify interactions with installer VM to set up jenkins-ci for cbench test - was grabbing stackrc for SDN_CONTROLLER_IP, but it actually in overcloudrc - need to skip hostkeychecking for scp operations - change permissions and ownership of /tmp/.ssh/ files so jenkins-ci can take over as the user Change-Id: I2d8f3aadfd6eff35a288a4e49eabb035bb2560ef Signed-off-by: Jamo Luhrsen --- jjb/cperf/cperf-ci-jobs.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml index 2742f08f7..6cd4e22dc 100644 --- a/jjb/cperf/cperf-ci-jobs.yml +++ b/jjb/cperf/cperf-ci-jobs.yml @@ -126,14 +126,18 @@ 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 $INSTALLER_IP:/home/stack/stackrc /tmp/stackrc - source /tmp/stackrc + 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 scp $INSTALLER_IP:/home/stack/.ssh/id_rsa /tmp/.ssh/ - sudo chmod -R 0600 /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 # cbench requires the openflow drop test feature to be installed. sshpass -p karaf ssh -o StrictHostKeyChecking=no \ -- 2.16.6