fix ci jobs (daily && no branch param)

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

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 8943afb..6cf35d6 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,126 +6,23 @@
 
     project: 'compass4nfv'
 
+    slave-label: 'compass-virtual'
+
     stream:
         - master:
-            slave_name: 'huawei-us-deploy-vm-1'
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
-            slave_name: 'huawei-us-deploy-vm-2'
+        - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 
-
     jobs:
-        - 'compass-verify-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-verify-deploy-{stream}'
-
 
 ########################
 # job templates
 ########################
-- job-template:
-    name: 'compass-verify-{stream}'
-
-    disabled: false
-
-    concurrent: true
-
-    wrappers:
-        - timeout:
-            timeout: 120
-            fail: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-verify-[^-]*'
-                - 'compass-os-.*?-virtual-daily-.*?'
-            block-level: 'NODE'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - 'huawei-virtual-defaults'
-        - '{installer}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
-
-    builders:
-        - trigger-builds:
-            - project: 'compass-verify-deploy-{stream}'
-              current-parameters: true
-              same-node: true
-              block: true
-
-- job-template:
-    name: 'compass-verify-deploy-{stream}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-deploy-huawei-virtual-daily-.*?'
-            block-level: 'NODE'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    builders:
-        - shell:
-            !include-raw: ./compass-build.sh
-        - shell:
-            !include-raw: ./compass-deploy.sh
-
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
-
 - job-template:
     name: 'compass-build-iso-{stream}'
 
@@ -136,32 +33,32 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
-        - timed: 'H 14 * * *'
+        - timed: 'H 8 * * *'
 
     builders:
         - shell:
-            !include-raw: ./compass-build.sh
+            !include-raw-escape: ./compass-build.sh
         - shell:
-            !include-raw: ./compass-upload-artifact.sh
+            !include-raw-escape: ./compass-upload-artifact.sh
         - shell:
-            !include-raw: ./compass-workspace-cleanup.sh
+            !include-raw-escape: ./compass-workspace-cleanup.sh
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
@@ -177,24 +74,24 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - '{node}-defaults'
         - '{installer}-defaults'
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - shell:
-            !include-raw: ./compass-makeppa.sh
+            !include-raw-escape: ./compass-makeppa.sh
 
 
 
@@ -222,14 +119,4 @@
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'liberty'
-                - 'juno'
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'trusty'
-                - 'centos7'