X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=d581380886b27ebe5149f0eb4760f8fa4e70daf5;hb=2d12bd59544438279297cb6331c869fc319ef376;hp=cc04ad3da6e4bd139fc5692fe90cf3f9ed8f2377;hpb=85615f4c81d269b330fdc51f7c69523b8bcfc4b7;p=releng.git

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index cc04ad3da..d58138088 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -12,15 +12,15 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
     distro:
-        - 'trusty':
+        - 'xenial':
             disabled: false
-            os-version: 'trusty'
+            os-version: 'xenial'
             openstack-os-version: ''
         - 'centos7':
             disabled: false
@@ -51,6 +51,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -64,21 +65,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'
@@ -106,7 +103,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'compass-virtual-defaults'
         - '{installer}-defaults'
@@ -137,7 +133,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 +147,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 +163,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -174,15 +177,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
@@ -192,11 +190,6 @@
             description: "Built on $NODE_NAME"
         - '{project}-verify-{phase}-macro'
 
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
 #####################################
 # builder macros
 #####################################
@@ -242,11 +235,9 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'mitaka'
                 - 'newton'
-                - 'liberty'
         - choice:
             name: COMPASS_OS_VERSION
             choices:
-                - 'trusty'
+                - 'xenial'
                 - 'centos7'