X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-macros.yaml;h=abbd7f6632612ca93c131b0b394d31f1d4735435;hb=2f45bf843b93b4c770a402ea1f38b5838f603d4f;hp=3933b0cd989e42049a612d199baf83f0da891530;hpb=9712aebd07d323d91d7e9f7f1392ae7768338644;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 3933b0cd9..abbd7f663 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -12,12 +12,12 @@
 - parameter:
     name: distribution-karaf-version
     # Arguments:
-    #   karaf-version: Provide, otherwise releng-defaults value is used.
+    #   karaf-version: Provide, otherwise defaults.yaml value is used.
     parameters:
       - string:
           name: KARAF_VERSION
           default: '{karaf-version}'
-          description: 'karaf3 or karaf4, affects ODL deploy scripts'
+          description: 'karaf3, karaf4, odl, affects ODL deploy scripts'
 
 - parameter:
     name: integration-bundle-url
@@ -79,6 +79,22 @@
           default: '{stream}'
           description: 'Distribution stream string, for suites to know which behavior to expect'
 
+- parameter:
+    name: integration-script-plan
+    parameters:
+      - string:
+          name: SCRIPTPLAN
+          default: '{script-plan}'
+          description: 'Script plan we will run before downloading and un-archiving am ODL distribution'
+
+- parameter:
+    name: integration-config-plan
+    parameters:
+      - string:
+          name: CONFIGPLAN
+          default: '{config-plan}'
+          description: 'Config plan we will run after un-archiving and starting an ODL distribution'
+
 - parameter:
     name: integration-stream-test-plan
     parameters:
@@ -104,8 +120,8 @@
           description: |
               List of space-separated suites. Useful when running specific suites within a testplan.
               Do not include ${{WORKSPACE}}/test/csit/suites/ in the values:
-              (ex. openstack/connectivity/l2.robot openstack/tempest/tempest.robot
-              integration/test/csit/suites/netvirt/ElanService/).
+              (ex. openstack/connectivity/l2.robot openstack/clustering/ha_l2.robot
+               openstack/tempest/tempest.robot netvirt/elan/elan.robot).
 
 - parameter:
     name: integration-test-options
@@ -194,7 +210,7 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: 'recheck$'
+                comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
           override-votes: true
           gerrit-build-unstable-verified-value: +1
           gerrit-build-unstable-codereview-value: 0
@@ -463,6 +479,12 @@
       - shell: !include-raw:
           - integration-deploy-openstack-run-test.sh
 
+- builder:
+    name: integration-apex-image-manager
+    builders:
+      - shell: !include-raw:
+          - ../opendaylight-infra-apex-image-management.sh
+
 - builder:
     name: integration-compare-distributions
     # Operation: will compare an already created distribtion (probably last
@@ -540,8 +562,17 @@
               build-steps:
                 - shell: |
                     #!/bin/bash
+                    echo "Archiving csit artifacts"
                     cd $WORKSPACE
                     mkdir -p ./archives
+                    for i in `seq 1 ${NUM_ODL_SYSTEM}`; do
+                        NODE_FOLDER="./archives/odl_${i}"
+                        mkdir -p ${NODE_FOLDER}
+                        mv odl${i}_* ${NODE_FOLDER} || true
+                        mv karaf_${i}_*_threads* ${NODE_FOLDER} || true
+                        mv *_${i}.png ${NODE_FOLDER} || true
+                        mv /tmp/odl${i}_* ${NODE_FOLDER} || true
+                    done
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d ./archives robot-plugin.zip
                     mv *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
@@ -585,3 +616,24 @@
                     fi
                     rm ${HOME}/.netrc
           mark-unstable-if-failed: true
+
+- publisher:
+    name: integration-csit-collect-netvirt-logs
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - inject:
+                    properties-file: 'slave_addresses.txt'
+                - shell: |
+                    #!/bin/bash
+                    source /tmp/common-functions.sh ${BUNDLEFOLDER}
+                    collect_netvirt_logs
+          mark-unstable-if-failed: true