X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml.j2;h=3ee91ba2b5993f50ff1a4f979158a417ff72f7c7;hb=915fa6616ac00461ba28732669a6d7e320a3e090;hp=d2adb914fdf55c352f750af3f9e28795825ed8e4;hpb=12bffc3ef1035092df057486fbb0f61b1b239bc6;p=releng.git

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index d2adb914f..3ee91ba2b 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -3,9 +3,6 @@
     name: 'apex'
     project: 'apex'
     jobs:
-      - 'apex-verify-{stream}'
-      - 'apex-verify-gate-{stream}'
-      - 'apex-verify-unit-tests-{stream}'
       - 'apex-runner-cperf-{stream}'
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
@@ -29,7 +26,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'master'
-          disable_daily: true
+          disable_daily: false
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -38,7 +35,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'euphrates'
-          disable_daily: false
+          disable_daily: true
       - danube: &danube
           branch: 'stable/danube'
           gs-pathname: '/danube'
@@ -62,332 +59,6 @@
       - 'baremetal'
       - 'virtual'
 
-# Unit Test
-- job-template:
-    name: 'apex-verify-unit-tests-{stream}'
-
-    node: '{build-slave}'
-
-    concurrent: true
-
-    parameters:
-      - apex-parameter:
-          gs-pathname: '{gs-pathname}'
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'apex'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'false'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'apex/tests/**'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: '*'
-                - compare-type: ANT
-                  pattern: 'apex/*'
-                - compare-type: ANT
-                  pattern: 'build/**'
-                - compare-type: ANT
-                  pattern: 'lib/**'
-                - compare-type: ANT
-                  pattern: 'config/**'
-                - compare-type: ANT
-                  pattern: 'apex/build/**'
-                - compare-type: ANT
-                  pattern: 'apex/common/**'
-                - compare-type: ANT
-                  pattern: 'apex/inventory/**'
-                - compare-type: ANT
-                  pattern: 'apex/network/**'
-                - compare-type: ANT
-                  pattern: 'apex/overcloud/**'
-                - compare-type: ANT
-                  pattern: 'apex/settings/**'
-                - compare-type: ANT
-                  pattern: 'apex/undercloud/**'
-                - compare-type: ANT
-                  pattern: 'apex/virtual/**'
-
-    properties:
-      - logrotate-default
-      - throttle:
-          max-per-node: 1
-          max-total: 10
-          option: 'project'
-
-    builders:
-      - shell:
-          !include-raw-escape: ./apex-unit-test.sh
-
-# Verify
-- job-template:
-    name: 'apex-verify-{stream}'
-
-    node: '{virtual-slave}'
-
-    concurrent: true
-
-    project-type: 'multijob'
-
-    parameters:
-      - apex-parameter:
-          gs-pathname: '{gs-pathname}/dev'
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - string:
-          name: ARTIFACT_VERSION
-          default: dev
-          description: "Used for overriding the ARTIFACT_VERSION"
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'true'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'apex'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              file-paths:
-                - compare-type: ANT
-                  pattern: '*'
-                - compare-type: ANT
-                  pattern: 'apex/*'
-                - compare-type: ANT
-                  pattern: 'build/**'
-                - compare-type: ANT
-                  pattern: 'lib/**'
-                - compare-type: ANT
-                  pattern: 'config/**'
-                - compare-type: ANT
-                  pattern: 'apex/build/**'
-                - compare-type: ANT
-                  pattern: 'apex/common/**'
-                - compare-type: ANT
-                  pattern: 'apex/inventory/**'
-                - compare-type: ANT
-                  pattern: 'apex/network/**'
-                - compare-type: ANT
-                  pattern: 'apex/overcloud/**'
-                - compare-type: ANT
-                  pattern: 'apex/settings/**'
-                - compare-type: ANT
-                  pattern: 'apex/undercloud/**'
-                - compare-type: ANT
-                  pattern: 'apex/virtual/**'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'apex/tests/**'
-                - compare-type: ANT
-                  pattern: 'docs/**'
-
-    properties:
-      - logrotate-default
-      - throttle:
-          max-per-node: 3
-          max-total: 10
-          option: 'project'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: basic
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-verify-unit-tests-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-build-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                ARTIFACT_VERSION=$ARTIFACT_VERSION
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
-      - multijob:
-          name: deploy-virtual
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                ARTIFACT_VERSION=$ARTIFACT_VERSION
-                DEPLOY_SCENARIO={verify-scenario}
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
-
-# Verify Scenario Gate
-- job-template:
-    name: 'apex-verify-gate-{stream}'
-
-    node: '{virtual-slave}'
-
-    concurrent: true
-
-    project-type: 'multijob'
-
-    parameters:
-      - apex-parameter:
-          gs-pathname: '{gs-pathname}/dev'
-      - 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."
-      - string:
-          name: ARTIFACT_VERSION
-          default: dev
-          description: "Used for overriding the ARTIFACT_VERSION"
-
-    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/**'
-                - compare-type: ANT
-                  pattern: 'apex/**'
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          block-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-virtual.*'
-      - throttle:
-          max-per-node: 1
-          max-total: 10
-          option: 'project'
-
-    builders:
-      - multijob:
-          name: deploy-virtual
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                ARTIFACT_VERSION=$ARTIFACT_VERSION
-                DEPLOY_SCENARIO=gate
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
-      # yamllint disable rule:line-length
-      - shell: |
-          echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario
-      # yamllint enable rule:line-length
-      - inject:
-          properties-file: detected_scenario
-      - multijob:
-          name: functest-smoke
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-apex-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                FUNCTEST_MODE=tier
-                FUNCTEST_TIER=healthcheck
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -458,8 +129,6 @@
 - job-template:
     name: 'apex-deploy-{platform}-{stream}'
 
-    node: 'apex-{platform}-{stream}'
-
     concurrent: true
 
     disabled: false
@@ -520,6 +189,8 @@
 
     project-type: 'multijob'
 
+    concurrent: true
+
     disabled: false
 
     scm:
@@ -746,7 +417,7 @@
               predefined-parameters:
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
               kill-phase-on: NEVER
-              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
       - multijob:
@@ -782,8 +453,6 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{baremetal-slave}'
-
     disabled: '{obj:disable_daily}'
 
     scm:
@@ -1112,7 +781,7 @@
       - string:
           name: SSH_KEY
           default: /root/.ssh/id_rsa
-          description: 'SSH key to use for Apex'
+          description: 'SSH key to use for Apex.'
 
     properties:
       - logrotate-default
@@ -1195,7 +864,7 @@
             - 'apex-run.*'
 
     triggers:
-      - timed: '0 1 * * *'
+      - timed: ''  # '0 1 * * *'
 
     builders:
       - description-setter:
@@ -1293,12 +962,6 @@
 {%- endfor %}
 {% endfor -%}
 
-- builder:
-    name: 'apex-unit-test'
-    builders:
-      - shell:
-          !include-raw: ./apex-unit-test.sh
-
 - builder:
     name: 'apex-upload-artifact'
     builders:
@@ -1323,12 +986,12 @@
 - trigger:
     name: 'apex-master'
     triggers:
-      - timed: '0 3 1 1 7'
+      - timed: '0 0 1-31/2 * *'
 
 - trigger:
     name: 'apex-euphrates'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 0 2-30/2 * *'
 
 - trigger:
     name: 'apex-danube'