X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=13830ce1d584456d3bcfa19e65f5250d73b29c9a;hb=d7fe7edebe4c9f3d82dd03213f689743ad352945;hp=75ebdb206c7cc1cc66654d6199cbd10183ebcaed;hpb=32408dd6f7506a2a791bd5c00bf7cd9509961a07;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 75ebdb206..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,61 +10,67 @@
     slave-label: 'compass-virtual'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: true
+      - 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-build-iso-{stream}'
-        - 'compass-build-ppa-{stream}'
+      - '{installer}-build-daily-{stream}'
+      - 'compass-build-ppa-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'compass-build-iso-{stream}'
+    name: '{installer}-build-daily-{stream}'
 
     disabled: '{obj:disabled}'
 
     concurrent: true
 
     properties:
-        - logrotate-default
-        - 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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - 'opnfv-build-ubuntu-defaults'
-        - '{installer}-defaults'
+      - 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:
-        - git-scm
+      - 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}'
@@ -77,30 +84,29 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - 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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - 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
+      - git-scm
 
     builders:
-        - shell:
-            !include-raw-escape: ./compass-makeppa.sh
-
+      - shell:
+          !include-raw-escape: ./compass-makeppa.sh
 
 
 ########################
@@ -109,22 +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/"
-
+      - 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/"