Merge "Step 3: Change remaining integration jobs"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 1 Sep 2015 20:59:00 +0000 (20:59 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 1 Sep 2015 20:59:00 +0000 (20:59 +0000)
jjb/integration/include-raw-integration-deploy-controller-offline.sh
jjb/integration/include-raw-integration-deploy-controller-run-test.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-python.yaml [deleted file]
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml

index 5c9cbfaf2f1832ce16d9c36a6670506a14ca77b0..bf07a09999f4d1a9d0dd3f5d653571cff9b8fd3c 100644 (file)
@@ -1,32 +1,6 @@
-NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 CONTROLLERMEM="3072m"
 ACTUALFEATURES="odl-integration-all"
 
-if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
-    # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
-    echo "Bundle version is ${BUNDLEVERSION}"
-    # Acquire the timestamp information from maven-metadata.xml
-    wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
-    TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
-    echo "Nexus timestamp is ${TIMESTAMP}"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-    BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
-    ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-else
-    ACTUALBUNDLEURL="${BUNDLEURL}"
-    BUNDLE="${BUNDLEURL##*/}"
-    BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-fi
-
-echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
-echo "Distribution bundle is ${BUNDLE}"
-echo "Distribution bundle version is ${BUNDLEVERSION}"
-echo "Distribution folder is ${BUNDLEFOLDER}"
-echo "Nexus prefix is ${NEXUSURL_PREFIX}"
-
 echo "Downloading the distribution..."
 wget --no-verbose  ${ACTUALBUNDLEURL}
 
index 6eee1c6396bc8e26c464c58007500a2655eea644..d87598ad5a5672f8ef706695463bbe726b28641d 100644 (file)
@@ -1,4 +1,3 @@
-export NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 CONTROLLERMEM="2048m"
 
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
@@ -8,31 +7,6 @@ else
     ACTUALFEATURES="${CONTROLLERFEATURES}"
 fi
 
-if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
-    # Extract the BUNDLEVERSION from the pom.xml
-    export BUNDLEVERSION=`xpath distribution/pom.xml '/project/version/text()' 2> /dev/null`
-    echo "Bundle version is ${BUNDLEVERSION}"
-    # Acquire the timestamp information from maven-metadata.xml
-    wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
-    TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`
-    echo "Nexus timestamp is ${TIMESTAMP}"
-    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-    export BUNDLE="distribution-karaf-${TIMESTAMP}.zip"
-    export ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-else
-    export ACTUALBUNDLEURL="${BUNDLEURL}"
-    export BUNDLE="${BUNDLEURL##*/}"
-    export BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
-    export BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
-fi
-
-echo "Distribution bundle URL is ${ACTUALBUNDLEURL}"
-echo "Distribution bundle is ${BUNDLE}"
-echo "Distribution bundle version is ${BUNDLEVERSION}"
-echo "Distribution folder is ${BUNDLEFOLDER}"
-echo "Nexus prefix is ${NEXUSURL_PREFIX}"
-
 if [ -f ${WORKSPACE}/test/csit/scriptplans/${TESTPLAN} ]; then
     echo "scriptplan exists!!!"
     echo "Changing the scriptplan path..."
index 1952cd3cdcb97217810a3daf9e01596c5f6a8aac..e9c8d10bbcbffd194fedd2bec3f7c57c0f4cda07 100644 (file)
             choosing-strategy: 'gerrit'
 
 # Macro: integration-test-gerrit-trigger-patch-submitted
-# Operation: this macro sets a trigger for patch submit on test/csit/suites/{project}/**
+# Operation: this macro sets a trigger for patch submit on csit/suites/{project}/**
 # Used by: {project}-verify-csit-* job templates
 
 - trigger:
                     pattern: 'csit/suites/{project}/**'
 
 # Macro: integration-csit-gerrit-trigger-patch-submitted
-# Operation: this macro sets a trigger for patch submit on test/csit/**
+# Operation: this macro sets a trigger for patch submit on csit/libraries
 # Used by: integration-verify-csit-1node-{stream} job template
 
 - trigger:
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: 'csit/**'
+                    pattern: 'csit/libraries/*'
 
 # Macro: integration-csit-gerrit-trigger-patch-merged
-# Operation: this macro sets a trigger for patch merged on test/csit/**
+# Operation: this macro sets a trigger for patch merged on csit/**
 # Used by: not used yet
 
 - trigger:
diff --git a/jjb/integration/integration-python.yaml b/jjb/integration/integration-python.yaml
deleted file mode 100644 (file)
index 48ffa44..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-- project:
-    name: integration-python
-    jobs:
-        - 'integration-verify-python-{stream}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - beryllium:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
-
-    project: 'integration'
-    jdk: 'openjdk7'
-
-- job-template:
-    name: 'integration-verify-python-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: freestyle
-    node: dynamic_verify
-    concurrent: true
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    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: 'integration'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: test/**
-
-    builders:
-        - shell: |
-            virtualenv $WORKSPACE/venv-tox
-            source $WORKSPACE/venv-tox/bin/activate
-            pip install tox argparse
-            tox --version
-            cd $WORKSPACE/test
-            tox
-
-    publishers:
-        - email-notification:
-            email-prefix: '[integration]'
index be3df57dc2593f6e6f8e25a23d4dd2b1788f79c4..f69ee328ec9f20829810901bf4463ca812aa4c3b 100644 (file)
@@ -85,6 +85,9 @@
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
index 34bbd2035cd8efc0af2cc01eb2cb0f2c3db1fac0..f36a610faa11b12219246c8b2fd3abaec31f6ef8 100644 (file)
@@ -2,7 +2,8 @@
 - project:
     name: integration-test-jobs
     jobs:
-        - 'integration-csit-verify-1node-{stream}'
+        - 'integration-verify-python'
+        - 'integration-csit-verify-1node-library'
         - 'integration-distribution-offline-{stream}'
         - 'integration-distribution-test-{stream}'
         - 'integration-patch-test-{stream}'
         aaa-distribution-{stream},
         integration-distribution-merge-{stream}
 
-# Template: integration-csit-verify-1node-{stream}
-# Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. library or variables)
-# Operation: This job template performs a base openflow test every time there is a change in the csit folder.
+# Template: integration-verify-python
+# Goal: Verify python scripts correct syntax
+# Operation: This job template performs a python tox check on any integration/test patch
 
 - job-template:
-    name: 'integration-csit-verify-1node-{stream}'
+    name: 'integration-verify-python'
+
+    project-type: freestyle
+    node: dynamic_verify
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: 'integration/test'
+        - gerrit-parameter:
+            branch: 'master'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - build-timeout
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: 'integration/test'
+            branch: 'master'
+
+    builders:
+        - shell: |
+            virtualenv $WORKSPACE/venv-tox
+            source $WORKSPACE/venv-tox/bin/activate
+            pip install tox argparse
+            tox --version
+            tox
+
+    publishers:
+        - email-notification:
+            email-prefix: '[integration]'
+
+# Template: integration-csit-verify-1node-library
+# Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
+# Operation: This job template performs a base openflow test when there is a change in the libraries folder
+
+- job-template:
+    name: 'integration-csit-verify-1node-library'
 
     project-type: freestyle
     node: dynamic_robot
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/test'
+        - integration-distribution-git-url
         - integration-branch:
-            branch: '{branch}'
+            branch: 'master'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
             test-plan: 'openflowplugin-flow-services.txt'
 
     scm:
-        - gerrit-trigger-scm:
+        - integration-distribution-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            branch: 'master'
+        - integration-gerrit-test-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'master'
 
     wrappers:
         - build-timeout
 
     triggers:
         - integration-csit-gerrit-trigger-patch-submitted:
-            name: 'integration'
-            branch: '{branch}'
+            name: 'integration/test'
+            branch: 'master'
 
     builders:
         - integration-get-slave-addresses
         - inject:
             properties-file: 'slave_addresses.txt'
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-run-test
 
     publishers:
 
 # Template: integration-distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
-# Operation: This daily job template deployes the controller removing any external repository definition
+# Operation: This job deployes the controller removing any external repository definition
+# whenever there is a change in a kernel project (odlparent, controller, yangtools, etc...)
 
 - job-template:
     name: 'integration-distribution-offline-{stream}'
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
+        - integration-distribution-git-url
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
 
     scm:
-        - git-scm:
+        - integration-distribution-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
             branch: '{branch}'
 
     wrappers:
             result: 'success'
 
     builders:
+        - integration-get-bundle-vars
+        - inject:
+            properties-file: 'bundle_vars.txt'
         - integration-deploy-controller-offline
 
     publishers: