X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=fe9170578c99f87e80cc5da77f6081c63cc34196;hb=3935025adda5f426b968304aca9183165935479f;hp=3733ec97192e418fe36eafd005ccaa87f44eb01d;hpb=bb14ee3615accbc8a7f17aeab619956f9fd3bf4e;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 3733ec971..fe9170578 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,23 +12,35 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - colorado:
+            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}'
+        - '{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
@@ -38,9 +50,11 @@
     parameters:
         - 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'
 
@@ -55,19 +69,21 @@
             !include-raw-escape: ./compass-build.sh
         - shell:
             !include-raw-escape: ./compass-upload-artifact.sh
-        - shell:
-            !include-raw-escape: ./compass-workspace-cleanup.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:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 1
@@ -77,9 +93,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - '{node}-defaults'
         - '{installer}-defaults'
     scm:
@@ -111,7 +129,7 @@
             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/"