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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 3941942e1..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
@@ -60,10 +68,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -88,6 +93,7 @@
                   - compare-type: ANT
                     pattern: 'tests/**'
     properties:
+        - logrotate-default
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -109,7 +115,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -117,10 +122,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -152,6 +154,7 @@
                     pattern: 'config/**'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -185,7 +188,7 @@
             block: true
             same-node: true
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
+          - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-verify-{stream}
               OPNFV_CLEAN=yes
@@ -195,7 +198,7 @@
         - trigger-builds:
           - project: 'functest-apex-{verify-slave}-suite-{stream}'
             predefined-parameters: |
-              DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
               FUNCTEST_SUITE_NAME=healthcheck
             block: true
             same-node: true
@@ -215,7 +218,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -223,12 +225,10 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -275,7 +275,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -283,12 +282,10 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: false
             block-level: 'NODE'
@@ -301,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
@@ -310,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
 
@@ -331,22 +328,19 @@
     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
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -362,7 +356,7 @@
         - trigger-builds:
           - project: 'apex-deploy-virtual-os-nosdn-nofeature-noha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-{stream}/build
+              BUILD_DIRECTORY=apex-build-{stream}/.build
               OPNFV_CLEAN=yes
             git-revision: false
             same-node: true
@@ -384,14 +378,12 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
         - string:
@@ -404,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'
@@ -431,14 +424,12 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
         - string:
@@ -447,6 +438,7 @@
             description: "Scenario to deploy with."
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -474,18 +466,17 @@
     disabled: false
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -566,6 +557,160 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
 
+
+# Colorado Build
+- job-template:
+    name: 'apex-build-colorado'
+
+    # Job template for builds
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: 'apex-daily-colorado'
+
+    disabled: false
+
+    concurrent: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: 'stable/colorado'
+        - apex-parameter:
+            gs-pathname: '/colorado'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - git-scm
+
+    properties:
+        - logrotate-default
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-deploy.*'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
+            option: 'project'
+
+    builders:
+        - 'apex-build'
+        - 'apex-upload-artifact'
+
+
+# Colorado FDIO Deploy
+- job-template:
+    name: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
+
+    # Job template for baremetal deployment
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: 'lf-pod1'
+
+    disabled: false
+
+    scm:
+        - git-scm
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: 'stable/colorado'
+        - apex-parameter:
+            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'
+            blocking-jobs:
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-build.*'
+
+
+    builders:
+        - 'apex-deploy'
+        - 'apex-workspace-cleanup'
+
+# Colorado FDIO Daily
+- job-template:
+    name: 'apex-daily-colorado'
+
+    # Job template for daily build
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+    node: 'apex-daily-colorado'
+
+    disabled: false
+
+    scm:
+        - git-scm
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: 'stable/colorado'
+        - apex-parameter:
+            gs-pathname: '/colorado'
+
+    properties:
+        - logrotate-default
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-verify.*'
+                - 'apex-deploy.*'
+                - 'apex-build.*'
+                - 'apex-runner.*'
+
+    triggers:
+        - 'apex-colorado'
+
+    builders:
+        - trigger-builds:
+          - project: 'apex-build-colorado'
+            git-revision: true
+            current-parameters: true
+            same-node: true
+            block: true
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-colorado/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-apex-daily-colorado-daily-colorado'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
 - job-template:
     name: 'apex-gs-clean-{stream}'
 
@@ -580,6 +725,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -672,6 +818,10 @@
     name: 'apex-master'
     triggers:
         - timed: '0 3 * * *'
+- trigger:
+    name: 'apex-colorado'
+    triggers:
+        - timed: '0 12 * * *'
 - trigger:
     name: 'apex-gs-clean-{stream}'
     triggers: