X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=0b430d7875c3dee96b6b7b62308ac42ed17d25e1;hb=6e813e78f82f3fbaba5e2804984ee35997255f67;hp=69112e3f92114b67a909388cd916e3542d5a8cd8;hpb=b829d86569211d23ca84857f98cfdc522448e686;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 69112e3f9..0b430d787 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -9,6 +9,9 @@
         - 'apex-deploy-virtual-{scenario}-{stream}'
         - 'apex-deploy-baremetal-{scenario}-{stream}'
         - 'apex-daily-{stream}'
+        - 'apex-daily-colorado'
+        - 'apex-build-colorado'
+        - 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -28,11 +31,17 @@
          - 'os-nosdn-nofeature-ha-ipv6'
          - 'os-nosdn-ovs-noha'
          - 'os-nosdn-fdio-noha'
-         - 'os-odl_l3-bgpvpn-ha'
-         - 'os-odl_l2-fdio-noha'
+         - 'os-nosdn-fdio-ha'
          - 'os-odl_l2-fdio-ha'
+         - 'os-odl_l2-netvirt_gbp_fdio-noha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
+         - 'os-odl-bgpvpn-ha'
+         - 'os-odl-gluon-noha'
+         - 'os-odl_l3-fdio-noha'
+         - 'os-odl_l3-fdio-ha'
+         - 'os-odl_l3-fdio_dvr-noha'
+         - 'os-odl_l3-fdio_dvr-ha'
          - 'os-onos-nofeature-ha'
 
     platform:
@@ -52,7 +61,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -85,6 +93,7 @@
                   - compare-type: ANT
                     pattern: 'tests/**'
     properties:
+        - logrotate-default
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -106,7 +115,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -146,6 +154,7 @@
                     pattern: 'config/**'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -209,7 +218,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -220,6 +228,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -266,7 +275,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -277,6 +285,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: false
             block-level: 'NODE'
@@ -289,7 +298,7 @@
 
     builders:
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters:
               OPNFV_CLEAN=yes
             git-revision: false
@@ -298,7 +307,7 @@
         - trigger-builds:
           - project: 'cperf-apex-intel-pod2-daily-{stream}'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
             block: true
             same-node: true
 
@@ -319,10 +328,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
-        - gerrit-parameter:
-            branch: '{branch}'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -332,6 +340,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -374,7 +383,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -388,6 +396,7 @@
             description: "Use yes in lower case to invoke clean. Indicates if the deploy environment should be cleaned before deployment"
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -420,7 +429,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -430,6 +438,7 @@
             description: "Scenario to deploy with."
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -462,12 +471,12 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -567,10 +576,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: 'stable/colorado'
         - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-        - gerrit-parameter:
-            branch: 'colorado'
+            gs-pathname: '/colorado'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -580,6 +588,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -592,14 +601,6 @@
 
     builders:
         - 'apex-build'
-        - trigger-builds:
-          - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-colorado'
-            predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-colorado/.build
-              OPNFV_CLEAN=yes
-            git-revision: false
-            same-node: true
-            block: true
         - 'apex-upload-artifact'
 
 
@@ -622,16 +623,16 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: 'colorado'
+            branch: 'stable/colorado'
         - apex-parameter:
-            gs-pathname: '{gs-pathname}'
+            gs-pathname: '/colorado'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-fdio-ha'
             description: "Scenario to deploy with."
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -664,12 +665,12 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
+            branch: 'stable/colorado'
         - apex-parameter:
-            gs-pathname: '{gs-pathname}'
+            gs-pathname: '/colorado'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -724,6 +725,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'