X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=8d2ab2ef0b9d3544952d5edda6968c00c1f5bfaf;hb=2bfc153956db44a47d4c58fa4bc4afc1c3b8a701;hp=512112e4203f2e9a406341dcf327fffc4e50038f;hpb=3b37a172d8da1358611fb7a1967e967232d9154d;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 512112e42..8d2ab2ef0 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -2,6 +2,7 @@
     name: apex
     jobs:
         - 'apex-verify-{stream}'
+        - 'apex-verify-gate-{stream}'
         - 'apex-verify-unit-tests-{stream}'
         - 'apex-runner-{platform}-{scenario}-{stream}'
         - 'apex-runner-cperf-{stream}'
@@ -9,10 +10,8 @@
         - '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'
         - 'apex-csit-promote-daily-{stream}'
+        - 'apex-fdio-promote-daily-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -23,6 +22,12 @@
             slave: 'lf-pod1'
             verify-slave: 'apex-verify-master'
             daily-slave: 'apex-daily-master'
+        - danube:
+            branch: 'stable/danube'
+            gs-pathname: '/danube'
+            slave: 'lf-pod1'
+            verify-slave: 'apex-verify-danube'
+            daily-slave: 'apex-daily-danube'
 
     project: 'apex'
 
@@ -33,6 +38,9 @@
          - 'os-nosdn-ovs-noha'
          - 'os-nosdn-fdio-noha'
          - 'os-nosdn-fdio-ha'
+         - 'os-nosdn-kvm-ha'
+         - 'os-nosdn-kvm-noha'
+         - 'os-odl_l2-fdio-noha'
          - 'os-odl_l2-fdio-ha'
          - 'os-odl_l2-netvirt_gbp_fdio-noha'
          - 'os-odl_l2-sfc-noha'
@@ -44,7 +52,9 @@
          - 'os-odl_l3-fdio_dvr-noha'
          - 'os-odl_l3-fdio_dvr-ha'
          - 'os-odl_l3-csit-noha'
+         - 'os-odl_l3-nofeature-noha'
          - 'os-onos-nofeature-ha'
+         - 'gate'
 
     platform:
          - 'baremetal'
@@ -175,7 +185,7 @@
         - 'apex-unit-test'
         - 'apex-build'
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
+          - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters: |
               BUILD_DIRECTORY=apex-verify-{stream}
               OPNFV_CLEAN=yes
@@ -185,22 +195,87 @@
         - trigger-builds:
           - project: 'functest-apex-{verify-slave}-suite-{stream}'
             predefined-parameters: |
-              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
               FUNCTEST_SUITE_NAME=healthcheck
             block: true
             same-node: true
+        - 'apex-workspace-cleanup'
+
+# Verify Scenario Gate
+- job-template:
+    name: 'apex-verify-gate-{stream}'
+
+    node: '{verify-slave}'
+
+    concurrent: true
+
+    parameters:
+        - apex-parameter:
+            gs-pathname: '{gs-pathname}'
+        - project-parameter:
+            project: '{project}'
+            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-gerrit
+
+    triggers:
+        - gerrit:
+            server-name: 'gerrit.opnfv.org'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: '^Patch Set [0-9]+: Code-Review\+2.*start-gate-scenario:.*'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'apex'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'lib/**'
+                  - compare-type: ANT
+                    pattern: 'config/**'
+
+    properties:
+        - logrotate-default
+        - build-blocker:
+            use-build-blocker: true
+            block-level: 'NODE'
+            blocking-jobs:
+                - 'apex-daily.*'
+                - 'apex-deploy.*'
+                - 'apex-build.*'
+                - 'apex-runner.*'
+                - 'apex-verify.*'
+        - throttle:
+            max-per-node: 1
+            max-total: 10
+            option: 'project'
+
+    builders:
+        - 'apex-build'
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
+          - project: 'apex-deploy-virtual-gate-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-verify-{stream}
+              BUILD_DIRECTORY=apex-verify-gate-{stream}
               OPNFV_CLEAN=yes
+            current-parameters: true
             git-revision: false
             block: true
             same-node: true
         - trigger-builds:
           - project: 'functest-apex-{verify-slave}-suite-{stream}'
             predefined-parameters: |
-              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
               FUNCTEST_SUITE_NAME=healthcheck
             block: true
             same-node: true
@@ -236,7 +311,7 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-verify.*'
-                - 'apex-csit.*'
+                - 'apex-.*-promote.*'
 
     builders:
         - trigger-builds:
@@ -301,16 +376,16 @@
 
     builders:
         - trigger-builds:
-          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+          - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-noha-{stream}'
             predefined-parameters:
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
             same-node: true
         - trigger-builds:
-          - project: 'cperf-apex-intel-pod2-daily-{stream}'
+          - project: 'cperf-apex-intel-pod2-daily-master'
             predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
             block: true
             same-node: true
 
@@ -488,7 +563,7 @@
                 - 'apex-deploy.*'
                 - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-csit.*'
+                - 'apex-.*-promote.*'
 
     triggers:
         - 'apex-{stream}'
@@ -530,6 +605,23 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        # 1.dovetail only master by now, not sync with A/B/C branches
+        # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
+        # 3.only debug testsuite here(includes basic testcase,
+        #   i.e. one tempest smoke ipv6, two vping from functest)
+        # 4.not used for release criteria or compliance,
+        #   only to debug the dovetail tool bugs with apex
+        #- trigger-builds:
+        #    - project: 'dovetail-apex-{slave}-debug-{stream}'
+        #      current-parameters: false
+        #      predefined-parameters:
+        #        DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+        #      block: true
+        #      same-node: true
+        #      block-thresholds:
+        #        build-step-failure-threshold: 'never'
+        #        failure-threshold: 'never'
+        #        unstable-threshold: 'FAILURE'
         - trigger-builds:
           - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
             predefined-parameters: |
@@ -590,104 +682,257 @@
                 build-step-failure-threshold: 'never'
                 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'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl-gluon-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl-gluon-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl-gluon-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l2-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            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'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            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'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-kvm-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-kvm-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-kvm-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l3-fdio-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-fdio-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-fdio-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-nosdn-ovs-ha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-ovs-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-nosdn-ovs-ha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l3-ovs-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-ovs-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-ovs-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
-# Colorado FDIO Daily
+# CSIT promote
 - job-template:
-    name: 'apex-daily-colorado'
+    name: 'apex-csit-promote-daily-{stream}'
 
-    # Job template for daily build
+    # Job template for promoting CSIT Snapshots
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: 'apex-daily-colorado'
+    node: '{daily-slave}'
 
     disabled: false
 
@@ -697,12 +942,11 @@
     parameters:
         - project-parameter:
             project: '{project}'
-            branch: 'stable/colorado'
+            branch: '{branch}'
         - apex-parameter:
-            gs-pathname: '/colorado'
+            gs-pathname: '{gs-pathname}'
 
     properties:
-        - logrotate-default
         - build-blocker:
             use-build-blocker: true
             block-level: 'NODE'
@@ -711,41 +955,36 @@
                 - 'apex-deploy.*'
                 - 'apex-build.*'
                 - 'apex-runner.*'
+                - 'apex-daily.*'
 
     triggers:
-        - 'apex-colorado'
+        - timed: '0 12 * * 0'
 
     builders:
+        - 'apex-build'
         - 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'
+          - project: 'apex-deploy-virtual-os-odl_l3-csit-noha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-build-colorado/.build
+              BUILD_DIRECTORY=apex-csit-promote-daily-{stream}
               OPNFV_CLEAN=yes
-            git-revision: true
-            same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
+            git-revision: false
             block: true
+            same-node: true
         - trigger-builds:
-          - project: 'functest-apex-apex-daily-colorado-daily-colorado'
-            predefined-parameters:
-              DEPLOY_SCENARIO=os-odl_l2-fdio-ha
+          - project: 'functest-apex-{daily-slave}-suite-{stream}'
+            predefined-parameters: |
+              DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+              FUNCTEST_SUITE_NAME=tempest_smoke_serial
             block: true
             same-node: true
-            block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+        - shell:
+            !include-raw-escape: ./apex-snapshot-create.sh
+        - shell:
+            !include-raw-escape: ./apex-upload-artifact.sh
 
-# CSIT promote
+# FDIO promote
 - job-template:
-    name: 'apex-csit-promote-daily-{stream}'
+    name: 'apex-fdio-promote-daily-{stream}'
 
     # Job template for promoting CSIT Snapshots
     #
@@ -777,26 +1016,16 @@
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
-    triggers:
-        - timed: '0 12 * * 0'
-
     builders:
         - 'apex-build'
         - trigger-builds:
-          - project: 'apex-deploy-virtual-os-odl_l3-csit-noha-{stream}'
+          - project: 'apex-deploy-virtual-os-odl_l2-fdio-noha-{stream}'
             predefined-parameters: |
-              BUILD_DIRECTORY=apex-csit-promote-daily-{stream}
+              BUILD_DIRECTORY=apex-fdio-promote-daily-{stream}
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
             same-node: true
-        - trigger-builds:
-          - project: 'functest-apex-{daily-slave}-suite-{stream}'
-            predefined-parameters: |
-              DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-              FUNCTEST_SUITE_NAME=tempest_smoke_serial
-            block: true
-            same-node: true
         - shell:
             !include-raw-escape: ./apex-snapshot-create.sh
         - shell:
@@ -908,9 +1137,9 @@
 - trigger:
     name: 'apex-master'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 3 1 1 7'
 - trigger:
-    name: 'apex-colorado'
+    name: 'apex-danube'
     triggers:
         - timed: '0 12 * * *'
 - trigger: