X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=d581380886b27ebe5149f0eb4760f8fa4e70daf5;hb=770d1a5795e05417092aae6a562ab9fb47b27562;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..ee91e02da 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -11,19 +11,25 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
+            ppa-pathname: '/{stream}'
             disabled: false
-        - colorado:
+            openstack-version: 'ocata'
+            branch-type: 'master'
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            ppa-pathname: '/{stream}'
+            disabled: false
+            openstack-version: 'newton'
+            branch-type: 'branch'
 
     distro:
-        - 'trusty':
+        - 'xenial':
             disabled: false
-            os-version: 'trusty'
+            os-version: 'xenial'
             openstack-os-version: ''
         - 'centos7':
-            disabled: false
+            disabled: true
             os-version: 'centos7'
             openstack-os-version: ''
 #####################################
@@ -37,6 +43,7 @@
 #####################################
     jobs:
         - 'compass-verify-{distro}-{stream}'
+        - 'compass-verify-k8-{distro}-{stream}'
         - 'compass-verify-{phase}-{distro}-{stream}'
 #####################################
 # job templates
@@ -51,6 +58,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -63,22 +71,19 @@
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -98,6 +103,7 @@
                 file-paths:
                   - compare-type: ANT
                     pattern: '**/*'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -106,13 +112,13 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'compass-virtual-defaults'
+        - 'compass-virtual-{branch-type}-defaults'
         - '{installer}-defaults'
         - 'compass-verify-defaults':
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -124,7 +130,12 @@
             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
+                  abort-all-job: true
+                - name: 'opnfv-yamllint-verify-{stream}'
                   current-parameters: true
                   node-parameters: true
                   kill-phase-on: FAILURE
@@ -137,7 +148,7 @@
                   current-parameters: true
                   predefined-parameters: |
                     COMPASS_OS_VERSION={os-version}
-                    COMPASS_OS_VERSION_OPTION={openstack-os-version}
+                    COMPASS_OPENSTACK_VERSION={openstack-version}
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -146,13 +157,124 @@
             condition: SUCCESSFUL
             projects:
                 - name: 'functest-compass-virtual-suite-{stream}'
-                  current-parameters: true
-                  predefined-parameters:
+                  current-parameters: false
+                  predefined-parameters: |
                     FUNCTEST_SUITE_NAME=healthcheck
+                    DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+                  node-parameters: true
+                  kill-phase-on: NEVER
+                  abort-all-job: true
+                - name: 'functest-compass-virtual-suite-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    FUNCTEST_SUITE_NAME=vping_ssh
+                    DEPLOY_SCENARIO=os-nosdn-nofeature-ha
                   node-parameters: true
                   kill-phase-on: NEVER
                   abort-all-job: true
 
+- job-template:
+    name: 'compass-verify-k8-{distro}-{stream}'
+
+    project-type: multijob
+
+    disabled: '{obj:disabled}'
+
+    concurrent: true
+
+    properties:
+        - logrotate-default
+        - throttle:
+            enabled: true
+            max-total: 4
+            max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-verify-[^-]*-[^-]*'
+                - 'compass-os-.*?-virtual-daily-.*?'
+            block-level: 'NODE'
+
+    wrappers:
+        - ssh-agent-wrapper
+        - timeout:
+            timeout: 240
+            fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
+
+    triggers:
+        - gerrit:
+            server-name: 'gerrit.opnfv.org'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'check k8'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify k8'
+                - comment-added-contains-event:
+                    comment-contains-value: 'check kubernetes'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify kubernetes'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
+            readable-message: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
+        - 'compass-virtual-{branch-type}-defaults'
+        - '{installer}-defaults'
+        - 'compass-verify-defaults':
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'k8-nosdn-nofeature-ha'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - multijob:
+            name: basic
+            condition: SUCCESSFUL
+            projects:
+                - name: 'opnfv-lint-verify-{stream}'
+                  current-parameters: true
+                  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
+            projects:
+                - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
+                  current-parameters: true
+                  predefined-parameters: |
+                    COMPASS_OS_VERSION={os-version}
+                  node-parameters: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
 
@@ -161,6 +283,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
@@ -173,30 +296,21 @@
                 - 'functest-compass-virtual.*'
             block-level: 'NODE'
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
-            timeout: 120
+            timeout: 240
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
         - '{project}-verify-{phase}-macro'
 
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
 #####################################
 # builder macros
 #####################################
@@ -235,17 +349,12 @@
             description: "URL to Google Storage."
         - string:
             name: PPA_REPO
-            default: "http://205.177.226.237:9999{gs-pathname}"
+            default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'mitaka'
-                - 'liberty'
         - choice:
             name: COMPASS_OS_VERSION
             choices:
-                - 'trusty'
+                - 'xenial'
                 - 'centos7'