Merge "Specify CI jobs time intervals for armband"

diff --git a/INFO.yaml b/INFO.yaml
index 3bb3cbe..dae36c9 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -4,11 +4,11 @@ project_creation_date: '2015-06-14'
 project_category: 'Integration & Testing'
 lifecycle_state: 'Incubation'
 project_lead: &opnfv_releng_ptl
-    name: 'Fatih Degirmenci'
-    email: 'fatih.degirmenci@ericsson.com'
-    id: 'fdegir'
-    company: 'Ericsson'
-    timezone: 'Europe/Stockholm'
+    name: 'Trevor Bramwell'
+    company: 'The Linux Foundation'
+    email: 'tbramwell@linuxfoundation.org'
+    id: 'bramwelt'
+    timezone: 'America/Los_Angeles'
 primary_contact: *opnfv_releng_ptl
 issue_tracking:
     type: 'jira'
@@ -38,6 +38,11 @@ repositories:
     - 'releng-xci'
 committers:
     - <<: *opnfv_releng_ptl
+    - name: 'Fatih Degirmenci'
+      email: 'fatih.degirmenci@ericsson.com'
+      company: 'Ericsson'
+      id: 'fdegir'
+      timezone: 'Europe/Stockholm'
     - name: 'Aric Gardner'
       email: 'agardner@linuxfoundation.org'
       company: 'The Linux Foundation'
@@ -68,11 +73,6 @@ committers:
       email: 'meimei@huawei.com'
       id: 'm00133142'
       timezone: 'Asia/Shanghai'
-    - name: 'Trevor Bramwell'
-      company: 'The Linux Foundation'
-      email: 'tbramwell@linuxfoundation.org'
-      id: 'bramwelt'
-      timezone: 'America/Los_Angeles'
     - name: 'Serena Feng'
       company: 'ZTE'
       email: 'feng.xiaowei@zte.com.cn'

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index a02561d..9616fb3 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -81,6 +81,7 @@ if [[ -f $OPENRC ]]; then
             exit 1
         fi
     fi
+    echo "export EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" >> ${OPENRC}
 else
     echo "ERROR: cannot find file $OPENRC. Please check if it is existing."
     sudo ls -al ${DOVETAIL_CONFIG}

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index e4e5705..2d112c7 100644 (file)
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -90,7 +90,7 @@
                 - compare-type: ANT
                   pattern: 'INFO.yaml'
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'

diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index f1585b9..1749328 100755 (executable)
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -68,7 +68,7 @@ export BUILD_TAG=$BUILD_TAG
 export NODE_NAME=$NODE_NAME
 
 if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
-    XCI_ANSIBLE_PARAMS="-e /home/devuser/releng-xci/scenario_overrides.yml"
+    export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml"
 fi
 
 cd xci
@@ -80,7 +80,7 @@ if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
 ---
 xci_scenarios_overrides:
   - scenario: $DEPLOY_SCENARIO
-    version: $GERRIT_CHANGE_ID
+    version: $GERRIT_PATCHSET_REVISION
     refspec: $GERRIT_REFSPEC
 EOF
 fi

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index e5c1a93..3b7df62 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -117,7 +117,7 @@
                 - compare-type: ANT
                   pattern: 'upstream/**'
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'sfc|sdnvpn'
+              project-pattern: 'sfc|sdnvpn|releng-xci-scenarios'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'