Remove quotes of parameter for functest-fuel-virtual-suite job

[releng.git] / jjb / multisite / multisite-daily-jobs.yml

diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index f2b2871..23c95f6 100644 (file)
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -24,7 +24,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-            timed: '#@midnight'
+            timed: '@midnight'
 
 - job-template:
     name: 'multisite-kingbird-virtual-daily-{stream}'
@@ -38,6 +38,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - choice:
             name: FRESH_INSTALL
             choices:
@@ -137,8 +138,8 @@
                 - name: 'functest-fuel-virtual-suite-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    DEPLOY_SCENARIO='os-nosdn-multisite-noha'
-                    FUNCTEST_SUITE_NAME='multisite'
+                    DEPLOY_SCENARIO=os-nosdn-multisite-noha
+                    FUNCTEST_SUITE_NAME=multisite
                     OS_REGION=RegionOne
                     REGIONONE_IP=100.64.209.10
                     REGIONTWO_IP=100.64.209.11
@@ -161,11 +162,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - string:
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
-        - gerrit-parameter:
-            branch: '{branch}'
         - 'fuel-defaults'
         - '{slave-label}-defaults'
         - choice:
@@ -250,7 +250,8 @@
             #!/bin/bash
 
             echo "This is where we install kingbird"
-            $WORKSPACE/tools/kingbird/deploy.sh
+            cd $WORKSPACE/tools/kingbird
+            ./deploy.sh
 ########################
 # publisher macros
 ########################