Merge "functest: daily jobs: Increase timeout"

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

diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index a71b9b7..65da308 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -5,11 +5,13 @@
 #--------------------------------
     master: &master
         stream: master
-        branch: '{stream}'
+        openstack-branch: '{stream}'
+        opnfv-branch: 'master'
         gs-pathname: ''
     ocata: &ocata
         stream: ocata
-        branch: 'stable/{stream}'
+        openstack-branch: 'stable/{stream}'
+        opnfv-branch: 'master'
         gs-pathname: '/{stream}'
 #--------------------------------
 #       scenarios
@@ -55,21 +57,9 @@
 #        Phases
 #--------------------------------
     phase:
-        - 'provision':
-            project: 'openstack'
-            project-repo: 'https://git.openstack.org/openstack/bifrost'
-            project-branch: '{branch}'
-            clone-location: '/opt/bifrost'
-        - 'deploy':
-            project: 'openstack'
-            project-repo: 'https://git.openstack.org/openstack/openstack-ansible'
-            project-branch: '{branch}'
-            clone-location: '/opt/openstack-ansible'
-        - 'functest':
-            project: 'opnfv'
-            project-repo: 'https://gerrit.opnfv.org/gerrit/functest'
-            project-branch: 'master'
-            clone-location: '/opt/functest'
+        - 'provision'
+        - 'deploy'
+        - 'functest'
 #--------------------------------
 # jobs
 #--------------------------------
@@ -88,12 +78,12 @@
     concurrent: false
 
     properties:
-        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'xci-os-.*?-{pod}-daily-.*'
+                - '^xci-os.*'
             block-level: 'NODE'
+        - logrotate-default
 
     parameters:
         - string:
@@ -147,28 +137,28 @@
     concurrent: false
 
     properties:
-        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'xci-provision-.*?-{pod}-daily-.*'
-                - 'xci-deploy-.*?-{pod}-daily-.*'
-                - 'xci-functest-.*?-{pod}-daily-.*'
+                - '^xci-provision.*'
+                - '^xci-deploy.*'
+                - '^xci-functest.*'
             block-level: 'NODE'
+        - logrotate-default
 
     parameters:
         - string:
-            name: PROJECT
-            default: '{project}'
+            name: OPENSTACK_BRANCH
+            default: '{openstack-branch}'
         - string:
-            name: PROJECT_REPO
-            default: '{project-repo}'
+            name: OPNFV_BRANCH
+            default: '{opnfv-branch}'
         - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
+            name: USE_PROMOTED_VERSIONS
+            default: 'true'
         - string:
-            name: CLONE_LOCATION
-            default: '{clone-location}'
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-nofeature-ha'
         - string:
             name: DISTRO
             default: '{distro}'
@@ -187,14 +177,9 @@
         - string:
             name: CLEAN_DIB_IMAGES
             default: 'true'
-
-    scm:
-        - git:
-            url: '$PROJECT_REPO'
-            branches:
-                - 'origin/{project-branch}'
-            wipe-workspace: true
-            timeout: 15
+        - label:
+            name: SLAVE_LABEL
+            default: '{slave-label}'
 
     builders:
         - description-setter: