X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=e43f976b5f9dff472e3dd84836097c4fb1e9fcc2;hb=c7c018465d458a5bd98cd630620c052db784f615;hp=56f54d838194f694ff4a37158aff9649307517c6;hpb=139e621ba828d039cee1066ed090e2d7b39bc6b1;p=releng.git

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 56f54d838..e43f976b5 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -13,11 +13,15 @@
             gs-pathname: ''
             ppa-pathname: '/{stream}'
             disabled: false
+            openstack-version: 'ocata'
+            branch-type: 'master'
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             ppa-pathname: '/{stream}'
             disabled: false
+            openstack-version: 'newton'
+            branch-type: 'branch'
 
     distro:
         - 'xenial':
@@ -67,14 +71,15 @@
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -108,7 +113,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'compass-virtual-defaults'
+        - 'compass-virtual-{branch-type}-defaults'
         - '{installer}-defaults'
         - 'compass-verify-defaults':
             installer: '{installer}'
@@ -143,6 +148,7 @@
                   current-parameters: true
                   predefined-parameters: |
                     COMPASS_OS_VERSION={os-version}
+                    COMPASS_OPENSTACK_VERSION={openstack-version}
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -188,14 +194,15 @@
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -227,7 +234,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - 'compass-virtual-defaults'
+        - 'compass-virtual-{branch-type}-defaults'
         - '{installer}-defaults'
         - 'compass-verify-defaults':
             installer: '{installer}'
@@ -287,14 +294,15 @@
                 - 'functest-compass-virtual.*'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     builders:
         - description-setter:
@@ -343,10 +351,6 @@
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'newton'
         - choice:
             name: COMPASS_OS_VERSION
             choices: