X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-merge-jobs.yml;h=e4e5705a7acbcbd2bfaaa8cccd918ff9976e576f;hb=b73e1c1f2058f6b80202d7d1a75b229c02ea858f;hp=c9788c3d94c78a7153f635ecdf1b1e1904f2edc1;hpb=448fdae19653c110b3d784861a7d14717e2c198b;p=releng.git

diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index c9788c3d9..e4e5705a7 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -9,16 +9,23 @@
     stream:
       - master:
           branch: '{stream}'
+          disabled: false
     # -------------------------------
     # distros
     # -------------------------------
     distro:
       - ubuntu:
           disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
       - centos:
-          disabled: false
+          disabled: true
+          kill-phase-on: NEVER
+          abort-all-job: false
       - opensuse:
           disabled: false
+          kill-phase-on: FAILURE
+          abort-all-job: true
     # -------------------------------
     # postmerge promotion phases
     # -------------------------------
@@ -41,7 +48,7 @@
 
     project-type: multijob
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     concurrent: false
 
@@ -65,6 +72,23 @@
             - comment-added-contains-event:
                 comment-contains-value: 'remerge'
           projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'false'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'xci/scripts/vm/**'
+                - compare-type: ANT
+                  pattern: 'docs/**'
+                - compare-type: ANT
+                  pattern: 'prototypes/**'
+                - compare-type: ANT
+                  pattern: 'upstream/**'
+                - compare-type: ANT
+                  pattern: 'INFO.yaml'
             - project-compare-type: 'REG_EXP'
               project-pattern: 'sfc|sdnvpn'
               branches:
@@ -84,6 +108,15 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
       - string:
           name: DISTRO
           default: 'all'
@@ -115,6 +148,9 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -128,6 +164,9 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -141,9 +180,12 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
+              kill-phase-on: NEVER
+              abort-all-job: false
       - inject:
           properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
       - multijob:
@@ -158,6 +200,9 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: true
@@ -167,7 +212,7 @@
 
     project-type: multijob
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     concurrent: false
 
@@ -205,6 +250,15 @@
       - label:
           name: SLAVE_LABEL
           default: 'xci-virtual'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -237,8 +291,8 @@
                 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
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
       - multijob:
           name: healthcheck
           condition: SUCCESSFUL
@@ -253,11 +307,12 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                FUNCTEST_MODE=tier
-                FUNCTEST_TIER=healthcheck
+                CI_LOOP=$CI_LOOP
+                FUNCTEST_MODE=$FUNCTEST_MODE
+                FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
               node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
+              kill-phase-on: '{kill-phase-on}'
+              abort-all-job: '{abort-all-job}'
 
     publishers:
       - postbuildscript:
@@ -292,6 +347,9 @@
       - string:
           name: DISTRO
           default: 'ubuntu'
+      - string:
+          name: CI_LOOP
+          default: 'merge'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'
@@ -342,6 +400,15 @@
       - string:
           name: PROJECT
           default: $GERRIT_PROJECT
+      - string:
+          name: CI_LOOP
+          default: 'merge'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
       - string:
           name: DISTRO
           default: 'all'
@@ -361,7 +428,7 @@
 
     wrappers:
       - inject:
-          properties-file: "$LOCAL_PROMOTION_METADATA_FILE"
+          properties-file: "/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO/scenario.properties"
       - ssh-agent-wrapper
       - build-timeout:
           timeout: 240
@@ -384,16 +451,17 @@
 - builder:
     name: 'xci-merge-deploy-macro'
     builders:
-      - shell: |
-          #!/bin/bash
-          echo "Hello World"
+      - shell:
+          !include-raw: ./xci-start-new-vm.sh
+
+      - shell:
+          !include-raw: ./xci-start-deployment.sh
 
 - builder:
     name: 'xci-merge-healthcheck-macro'
     builders:
-      - shell: |
-          #!/bin/bash
-          echo "Hello World"
+      - shell:
+          !include-raw: ./xci-run-functest.sh
 
 - builder:
     name: 'xci-merge-promote-macro'