X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=f5a54c8d9f069748d8058a0e1bd2bbf02a038ba1;hb=26e735a55134a17d3c7cd26d8100a790a484a171;hp=69cc958a8272543d67276738da9cda14b968171a;hpb=d8ec3fcab553c186736224caa1a1f187dff7bdc5;p=releng.git

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 69cc958a8..f5a54c8d9 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,15 +65,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
@@ -141,17 +137,24 @@
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-#        - multijob:
-#            name: smoke-test
-#            condition: SUCCESSFUL
-#            projects:
-#                - name: 'functest-compass-virtual-suite-{stream}'
-#                  current-parameters: true
-#                  predefined-parameters:
-#                    FUNCTEST_SUITE_NAME=healthcheck
-#                  node-parameters: true
-#                  kill-phase-on: NEVER
-#                  abort-all-job: true
+        - multijob:
+            name: smoke-test
+            condition: SUCCESSFUL
+            projects:
+                - name: 'functest-compass-virtual-suite-{stream}'
+                  current-parameters: true
+                  predefined-parameters:
+                    FUNCTEST_SUITE_NAME=healthcheck
+                  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 +164,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -174,15 +178,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,11 +241,9 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'mitaka'
                 - 'newton'
-                - 'liberty'
         - choice:
             name: COMPASS_OS_VERSION
             choices:
-                - 'trusty'
+                - 'xenial'
                 - 'centos7'