X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcperf%2Fcperf-ci-jobs.yml;h=6cd4e22dc0a2a8c6991b201f108b32c5cb4708e7;hb=9d7290af5591ca634681845c50d079f095a6e03b;hp=d1914f6f134417d4737e96ce54ba41b117d82fc5;hpb=e38a2eff7cc1368f0cf92f372787e0f42247923d;p=releng.git

diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index d1914f6f1..6cd4e22dc 100644
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -13,6 +13,11 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
+    danube: &danube
+        stream: danube
+        branch: 'stable/{stream}'
+        gs-pathname: '/{stream}'
+        docker-tag: 'stable'
 
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
@@ -24,7 +29,9 @@
         - intel-pod2:
             installer: apex
             <<: *master
-
+        - intel-pod2:
+            installer: apex
+            <<: *danube
 #--------------------------------
 
     testsuite:
@@ -119,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 \