X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=13830ce1d584456d3bcfa19e65f5250d73b29c9a;hb=4a3d73952f8c5b4b4a308ebfa108a84f0c6b3c0e;hp=e92c7653b6b24ea3b241539d5368b30de8ad96dc;hpb=d1a117e87cfdccd2e45ea2e286191081b37c04af;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index e92c7653b..13830ce1d 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -1,3 +1,4 @@
+---
 - project:
 
     name: compass-project
@@ -9,211 +10,103 @@
     slave-label: 'compass-virtual'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-        - brahmaputra:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          ppa-pathname: '/{stream}'
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
 
     jobs:
-        - 'compass-verify-{stream}'
-        - 'compass-build-iso-{stream}'
-        - 'compass-build-ppa-{stream}'
-        - 'compass-verify-deploy-{stream}'
-
+      - '{installer}-build-daily-{stream}'
+      - 'compass-build-ppa-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'compass-verify-{stream}'
+    name: '{installer}-build-daily-{stream}'
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     concurrent: true
 
-    wrappers:
-        - timeout:
-            timeout: 120
-            fail: true
-
     properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-verify-[^-]*'
-                - 'compass-os-.*?-virtual-daily-.*?'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          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}'
-        - '{installer}-defaults'
-        - '{slave-label}-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}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: '**/*'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-
-    builders:
-        - trigger-builds:
-            - project: 'compass-verify-deploy-{stream}'
-              current-parameters: true
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'functest-{slave-label}-suite-{stream}'
-              current-parameters: true
-              predefined-parameters:
-                FUNCTEST_SUITE_NAME=healthcheck
-              same-node: true
-              block: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-
-- job-template:
-    name: 'compass-verify-deploy-{stream}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-deploy-virtual-daily-.*?'
-            block-level: 'NODE'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-project-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - 'opnfv-build-ubuntu-defaults'
+      - '{installer}-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    builders:
-        - shell:
-            !include-raw-escape: ./compass-build.sh
-        - shell:
-            !include-raw-escape: ./compass-deploy.sh
-
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
-
-- job-template:
-    name: 'compass-build-iso-{stream}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-            option: 'project'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - 'opnfv-build-ubuntu-defaults'
-        - '{installer}-defaults'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm
 
     triggers:
-        - timed: 'H 8 * * *'
+      - timed: 'H 8 * * *'
 
     builders:
-        - shell:
-            !include-raw-escape: ./compass-build.sh
-        - shell:
-            !include-raw-escape: ./compass-upload-artifact.sh
-        - shell:
-            !include-raw-escape: ./compass-workspace-cleanup.sh
+      - shell:
+          !include-raw-escape: ./compass-build.sh
+      - shell:
+          !include-raw-escape: ./compass-upload-artifact.sh
+      - 'clean-workspace'
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
 
     description: "build ppa(using docker) in huawei lab"
 
+    disabled: '{obj:disabled}'
+
     node: huawei-build
 
     concurrent: true
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 1
+          max-per-node: 1
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-project-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - '{node}-defaults'
+      - '{installer}-defaults'
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm
 
     builders:
-        - shell:
-            !include-raw-escape: ./compass-makeppa.sh
-
+      - shell:
+          !include-raw-escape: ./compass-makeppa.sh
 
 
 ########################
@@ -222,32 +115,21 @@
 - parameter:
     name: compass-project-parameter
     parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build_output
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: CACHE_DIRECTORY
-            default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
-            description: "Directory where the cache to be used during the build is located."
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - string:
-            name: PPA_REPO
-            default: "http://205.177.226.237:9999{gs-pathname}"
-        - string:
-            name: PPA_CACHE
-            default: "$WORKSPACE/work/repo/"
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'mitaka'
-                - 'liberty'
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'trusty'
-                - 'centos7'
-
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+      - string:
+          name: CACHE_DIRECTORY
+          default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
+          description: "Directory where the cache to be used during the build is located."
+      - string:
+          name: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "URL to Google Storage."
+      - string:
+          name: PPA_REPO
+          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+      - string:
+          name: PPA_CACHE
+          default: "$WORKSPACE/work/repo/"