Apex: changing Gluon scenario name to noha

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 5c1bded..0b430d7 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -36,7 +36,8 @@
          - 'os-odl_l2-netvirt_gbp_fdio-noha'
          - 'os-odl_l2-sfc-noha'
          - 'os-odl_l3-nofeature-ha'
-         - 'os-odl_l3-bgpvpn-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'
@@ -60,7 +61,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -93,6 +93,7 @@
                   - compare-type: ANT
                     pattern: 'tests/**'
     properties:
+        - logrotate-default
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -114,7 +115,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -154,6 +154,7 @@
                     pattern: 'config/**'
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -217,7 +218,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -228,6 +228,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -274,7 +275,6 @@
             gs-pathname: '{gs-pathname}'
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -285,6 +285,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: false
             block-level: 'NODE'
@@ -327,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
@@ -340,6 +340,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -382,7 +383,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -396,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'
@@ -428,7 +429,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - apex-parameter:
             gs-pathname: '{gs-pathname}'
@@ -438,6 +438,7 @@
             description: "Scenario to deploy with."
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -470,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'
@@ -575,10 +576,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: 'stable/colorado'
         - apex-parameter:
             gs-pathname: '/colorado'
-        - gerrit-parameter:
-            branch: 'stable/colorado'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -588,6 +588,7 @@
         - git-scm
 
     properties:
+        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -622,7 +623,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: 'stable/colorado'
         - apex-parameter:
             gs-pathname: '/colorado'
@@ -632,6 +632,7 @@
             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: 'stable/colorado'
         - apex-parameter:
             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}'