X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=a279553f5f40f770164f84512151b56e75120d74;hb=ca8d5d9f1f054acece699037b6487e679b282419;hp=82e3dfdf2de3d9e10e996b697b2b57bc64eddda6;hpb=1a2d904f601ff1c4d8796a010984741ec0318b04;p=releng.git

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 82e3dfdf2..a279553f5 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -12,19 +12,15 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     distro:
-        - 'trusty':
-            disabled: false
-            os-version: 'trusty'
-            openstack-os-version: ''
-        - 'centos7':
+        - 'xenial':
             disabled: false
-            os-version: 'centos7'
+            os-version: 'xenial'
             openstack-os-version: ''
 #####################################
 # patch verification phases
@@ -51,6 +47,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -64,21 +61,17 @@
             block-level: 'NODE'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 120
             fail: true
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -124,7 +117,7 @@
             name: basic
             condition: SUCCESSFUL
             projects:
-                - name: 'compass-verify-basic-{stream}'
+                - name: 'opnfv-lint-verify-{stream}'
                   current-parameters: true
                   node-parameters: true
                   kill-phase-on: FAILURE
@@ -137,7 +130,6 @@
                   current-parameters: true
                   predefined-parameters: |
                     COMPASS_OS_VERSION={os-version}
-                    COMPASS_OS_VERSION_OPTION={openstack-os-version}
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -152,6 +144,13 @@
                   node-parameters: true
                   kill-phase-on: NEVER
                   abort-all-job: true
+                - name: 'functest-compass-virtual-suite-{stream}'
+                  current-parameters: true
+                  predefined-parameters:
+                    FUNCTEST_SUITE_NAME=vping_ssh
+                  node-parameters: true
+                  kill-phase-on: NEVER
+                  abort-all-job: true
 
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
@@ -161,6 +160,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -174,15 +174,10 @@
             block-level: 'NODE'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 120
             fail: true
@@ -242,10 +237,8 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'mitaka'
-                - 'liberty'
+                - 'newton'
         - choice:
             name: COMPASS_OS_VERSION
             choices:
-                - 'trusty'
-                - 'centos7'
+                - 'xenial'