Merge "bottlenecks: rewrite the rubbos graph drawing function"

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index da08f31..355678f 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -95,11 +95,14 @@ if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then
     exit 0
 fi
 
+echo
 echo "SFC Scenario is deployed"
+echo
 
+# The stuff below is here temporarily and will be fixed once the release is out
 # The stuff below is here temporarily and will be fixed once the release is out
 export FUEL_MASTER_IP=10.20.0.2
-export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH##*/}"
+export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}"
 export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \
     -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \
     grep opendaylight | cut -d'|' -f5)
@@ -110,23 +113,26 @@ if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then
     exit 1
 fi
 
+echo
 echo "Copying and executing poc.tacker-up.sh script on controller node $CONTROLLER_NODE_IP"
+echo
 
 expect << END
-spawn /usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@\$env(FUEL_MASTER_IP)
+spawn /usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root $::env(FUEL_MASTER_IP)
 expect {
   -re ".*sword.*" {
     exp_send "r00tme\r"
   }
 }
 expect "# "
-send "/usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@\$env(CONTROLLER_NODE_IP)\r"
+send "/usr/bin/ssh -l root $::env(CONTROLLER_NODE_IP)\r"
 expect "# "
-send "/usr/bin/curl -o /root/poc.tacker-up.sh \$env(TACKER_SCRIPT_URL)\r"
+send "/usr/bin/curl -o /root/poc.tacker-up.sh $::env(TACKER_SCRIPT_URL)\r"
 expect "# "
 send "/bin/bash /root/poc.tacker-up.sh\r"
 expect "# "
 send "exit\r"
-expect "# "
+expect "Connection to $::env(CONTROLLER_NODE_IP) closed. "
 send "exit\r"
+expect "Connection to $::env(FUEL_MASTER_IP) closed. "
 END

diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index d33bdda..8dd0a4a 100644 (file)
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -25,12 +25,15 @@
     pod:
         - dell-us-testing-bm-1:
             installer: compass
+            auto-trigger-name: 'qtip-daily-dell-us-testing-bm-1-trigger'
             <<: *brahmaputra
         - orange-pod2:
             installer: joid
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
             <<: *brahmaputra
         - dell-us-deploying-bm3:
             installer: fuel
+            auto-trigger-name: 'qtip-daily-dell-us-deploying-bm3-trigger'
             <<: *brahmaputra
 
 #--------------------------------
@@ -39,6 +42,7 @@
         - juniper-pod1:
             installer: joid
             <<: *master
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
 #      - zte-build-1:   #would be confirmed with the ZTE lab by tomorrow
 #            installer: fuel
 #            <<: *master
@@ -56,19 +60,22 @@
     disabled: false
 
     parameters:
-      - project-parameter:
-          project: '{project}'
-      - '{pod}-defaults'
-      - '{installer}-defaults'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+        - project-parameter:
+            project: '{project}'
+        - '{pod}-defaults'
+        - '{installer}-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
 
     scm:
-       - git-scm:
-           credentials-id: '{ssh-credentials}'
-           refspec: ''
-           branch: '{branch}'
+        - git-scm:
+              credentials-id: '{ssh-credentials}'
+              refspec: ''
+              branch: '{branch}'
+
+    triggers:
+        - '{auto-trigger-name}'
 
     builders:
         - 'qtip-cleanup'
@@ -158,3 +165,29 @@
                     docker rmi opnfv/qtip:$tag
                 done
             fi
+
+#################
+#trigger macros
+#################
+
+- trigger:
+    name: 'qtip-daily-dell-us-deploying-bm3-trigger'
+    triggers:
+        - timed: '0 0 * * *'
+
+- trigger:
+    name: 'qtip-daily-dell-us-testing-bm-1-trigger'
+    triggers:
+        - timed: '0 3 * * *'
+
+#- trigger:
+#    name: 'qtip-daily-juniper-build1-trigger'
+#    triggers:
+#        - timed : '0 0 * * *'
+
+#- trigger:
+#   name: 'qtip-dailty-orange-fr-pod2-trigger'
+#   triggers:
+#       - timed : ' 0 0 * * *'
+
+