Merge "Set Jenkins parameter 'GIT_BASE' for overriding the default value"

[releng.git] / jjb / compass4nfv / compass-verify-jobs.yml

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 6927145..444b173 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -16,13 +16,13 @@
           disabled: false
           openstack-version: 'ocata'
           branch-type: 'master'
-      - danube:
+      - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'newton'
-          branch-type: 'branch'
+          openstack-version: 'ocata'
+          branch-type: 'master'
 
     distro:
       - 'xenial':
@@ -70,12 +70,13 @@
           blocking-jobs:
             - 'compass-verify-[^-]*-[^-]*'
             - 'compass-os-.*?-virtual-daily-.*?'
+            - 'compass-k8-.*?-virtual-daily-.*?'
           block-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
       - timeout:
-          timeout: 240
+          timeout: 360
           fail: true
       - fix-workspace-permissions
 
@@ -136,11 +137,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-            - name: 'opnfv-yamllint-verify-{stream}'
-              current-parameters: true
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
       - multijob:
           name: deploy-virtual
           condition: SUCCESSFUL
@@ -261,11 +257,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
-            - name: 'opnfv-yamllint-verify-{stream}'
-              current-parameters: true
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
       - multijob:
           name: deploy-virtual
           condition: SUCCESSFUL
@@ -302,7 +293,7 @@
     wrappers:
       - ssh-agent-wrapper
       - timeout:
-          timeout: 240
+          timeout: 360
           fail: true
       - fix-workspace-permissions