Merge "Set distro-check job time limit to 60 minutes"

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 4a594ca65500dd524e73f32041aeac0bb24ce261..a74cd82d543019a72eaa37c7b7738298fedfd357 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -612,7 +612,7 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-          This job builds a distrbution against your patch, passes distribution sanity test
+          This job builds a distrbution against your patch, tiggers distribution sanity CSIT jobs
           and reports back the results to Gerrit. Leave a comment with trigger keyword above
           to activate it for a particular patch.
 
@@ -624,13 +624,34 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
             <p>
               Running the "test-distribution" trigger will cause Jenkins to
               remove it's existing vote if it's already -1 or +1'd a comment.
-              You will need to re-run your verify job (recheck) after running
+              You will need to re-run your verify jobs (recheck) after running
               this to get Jenkins to put back the correct vote.
             </p>
           </div>
         </td>
       </tr>
 
+      <tr class="warning">
+        <td><b>Job Template</b><br/>{project}-distribution-check-{stream}</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | redistcheck</td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          This job runs the PROJECT-distribution-check-BRANCH job which is
+          building also integration/distribution project in order to run SingleFeatureTest.
+
+          The <b>redistcheck</b> trigger is useful in cases where a project's
+          other jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, redistcheck could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Redistcheck is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
+        </td>
+      </tr>
+
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-integration-{stream}</td>
         <td></td>
@@ -653,13 +674,17 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-          The Merge job template is similar to the Verify Job Template except
-          it will trigger once a Gerrit patch is merged into the repo. It
-          also automatically runs the Maven goals <b>source:jar</b> and
-          <b>javadoc:jar</b>.
-
-          This job will upload artifacts to OpenDaylight's
+          This job will trigger once a Gerrit patch is merged into the repo.
+          It will build HEAD of the current project branch and also run the Maven goals
+          <b>source:jar</b> and <b>javadoc:jar</b>.
+          Artifacts are uploaded to OpenDaylight's
           <a href="https://nexus.opendaylight.org">Nexus</a> on completion.
+
+          Running the "remerge" trigger is possible before a Change is merged,
+          in which case it will cause Jenkins to remove it's existing vote
+          if it's already -1 or +1'd a comment.
+          You will need to re-run your verify jobs (recheck) after running
+          this to get Jenkins to put back the correct vote.
         </td>
       </tr>
 
@@ -691,7 +716,7 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
 
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-validate-autorelease-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | revalidate</td>
       </tr>
       <tr>
         <td colspan="2">
@@ -700,9 +725,13 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
           features that do not exist in the current release.
 
           The <b>revalidate</b> trigger is useful in cases where a project's
-          verify job passed however validate failed due to infra problems or
-          intermittent issues. It will retrigger just the validate-autorelease
-          job.
+          other job passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, revalidate could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Revalidate is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
         </td>
       </tr>
 
@@ -712,14 +741,25 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
       </tr>
       <tr>
         <td colspan="2">
-            The Verify job template creates a Gerrit Trigger job that will
-            trigger when a new patch is submitted to Gerrit.
+          The Verify job template creates a Gerrit Trigger job that will
+          trigger when a new patch is submitted to Gerrit.
+          The job only builds the project code (including unit and integration tests).
+
+          The <b>reverify</b> trigger is useful in cases where a project's
+          other jobs passed however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, reverify could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Reverify is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-verify-node-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | renode</td>
       </tr>
       <tr>
         <td colspan="2">
@@ -731,12 +771,22 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
           {nodever} containing the directory relative to the project root
           containing the nodejs package.json and version of node you wish to
           run tests with.
+
+          The <b>renode</b> trigger is useful in cases where a project's
+          other jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, renode could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Renode is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-verify-python-{stream} | {project}-verify-tox-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
+        <td><b>Gerrit Trigger</b><br/>recheck | retox</td>
       </tr>
       <tr>
         <td colspan="2">
@@ -749,6 +799,16 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
           The 2 template names verify-python & verify-tox are identical and are
           aliases to each other. This allows the project to use the naming that
           is most reasonable for them.
+
+          The <b>retox</b> trigger is useful in cases where a project's
+          other verify jobs passed, however this job failed due to infra problems or
+          intermittent issues. It will retrigger just this job to save time.
+
+          BEWARE: If there were other failed jobs, retox could lead
+          to false Verified+1 vote, risking a merge which breaks other projetcs.
+          Retox is only for committers who are familiar with the risks involved.
+          If in doubt, use the safe trigger word: recheck.
+          Recheck triggers every job involved in verifying latest patch set in the Change.
         </td>
       </tr>
 

diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml
index 9bc8417c6edf555114bc1595e7d65d9b495f7ff7..fb2fa065a39c969c490060d188763b2082d12a23 100644 (file)
--- a/jjb/autorelease/autorelease-macros.yaml
+++ b/jjb/autorelease/autorelease-macros.yaml
@@ -51,9 +51,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index fd24db2e424466a8b982643846c3059450268b7e..2c196b272b7120418828a3d7b1293fb9403ce641 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -93,11 +93,14 @@
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'true'
-                    exclude-trivial-rebase: '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: 'redocs'
+                    # FIXME: Describe this job in docs/jenkins.rst including the BEWARE section.
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '**'

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 0b48b807becd1d4fb7e97c36ba59ea3385d60d46..368223639c05c8610796c2ebab11bdb922b2ae13 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -179,7 +179,7 @@ cat testplan.txt
 SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
 -v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
 -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \

diff --git a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
index 68bfe24980e0e12250c663e1d7d58dae0eff5608..9354338320d01525119d733622f564911a9ed6ad 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
+++ b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
@@ -12,7 +12,7 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 
 echo "Starting Robot test suites ${SUITES} ..."
 
-pybot -e exclude \
+pybot --removekeywords wuks -e exclude \
 -v WORKSPACE:$WORKSPACE -v USER_HOME:$HOME -L TRACE \
 -v DEVSTACK_SYSTEM_USER:$USER \
 -v DEVSTACK_SYSTEM_IP:$OPENSTACK_CONTROL_NODE_IP \

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index fda65529c25dbdbeb0d8af0fa3fd06b0ed2b7d8f..b8e0f6998f155f68c01699c05359bb997cb904f7 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -449,8 +449,8 @@ cat testplan.txt
 SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} \
--v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
+-v BUNDLE_URL:${ACTUALBUNDLEURL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_1_IP} -v ODL_SYSTEM_2_IP:${ODL_SYSTEM_2_IP} \
 -v ODL_SYSTEM_3_IP:${ODL_SYSTEM_3_IP} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} -v CONTROLLER_USER:${USER} -v OS_USER:${USER} \
 -v NUM_OS_SYSTEM:${NUM_OPENSTACK_SYSTEM} -v OS_CONTROL_NODE_IP:${OPENSTACK_CONTROL_NODE_IP} \

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 1566f03981d870743048d220029a473794607ce0..8fbe6af441b2354ce9ff1cad2f0d04caf444511a 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -25,8 +25,7 @@ set -exu
 pip install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr
-pip install --upgrade robotframework{,-{httplibrary,requests,selenium2library}}
-pip install --upgrade robotframework-sshlibrary pycparser==2.13  # TODO: Unfreeze when cryptography stops failing on pycparser-2.14-py2.py3-none-any.whl
+pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
 
 # Module jsonpath is needed by current AAA idmlite suite.
 pip install --upgrade jsonpath-rw

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index bbcd8dea909aec03fe2c76f39ff0d29b803c6bb3..1f54c60d4c617e072c1cd6b500d6b853d0ced553 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -110,7 +110,7 @@ cat testplan.txt
 SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} \
 -v WORKSPACE:/tmp -v BUNDLE_URL:${ACTUALBUNDLEURL} -v JAVA_HOME:${JAVA_HOME} \
 -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} \
 -v CONTROLLER:${ODL_SYSTEM_IP} -v CONTROLLER1:${ODL_SYSTEM_2_IP} -v CONTROLLER2:${ODL_SYSTEM_3_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index f5b0d4e867c272e901fc50db5fd7ca49061e8bc0..33110dc1924b290c6ceafb58d5b67cbb5d9e96d3 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -56,7 +56,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-relevant-patch-submitted:
+        - gerrit-trigger-patch-submitted:
             name: 'integration/distribution'
             branch: '{branch}'
 

diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index 984e8d844f64e9bdf5fdbef27b6f5b4249483453..acac17bd196167908a4d1639f27792be60ce5897 100644 (file)
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -35,9 +35,9 @@
         - gerrit:
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck-opendaylight'
             projects:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8bd83398a4b730ee73cd4e85e43f91e0d0716f7a..c26dc2bd10f62496ecef71790ec3f976fb6794e3 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -74,9 +74,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
@@ -136,9 +136,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c2ca83a74ca20090737a9695e86d167e66c2b493..873d5ce52bf54ddcc7affdc2b403340a2ce240ba 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -126,30 +126,9 @@
             timeout: 360
             fail: true
 
+# Used only by opflex-verify-{stream} and {project-name}-verify-{stream}-{maven}-{jdks}
 - trigger:
     name: gerrit-trigger-patch-submitted
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - 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: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-
-- trigger:
-    name: gerrit-trigger-relevant-patch-submitted
     triggers:
         - gerrit:
             server-name: 'OpenDaylight'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 2903cc66972f5c64c4f854b7ee08072c51288337..acae5f121af2efc7c70447d1d17bf5ed2cb66c6d 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -177,12 +177,10 @@
                 - patchset-created-event:
                     exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-distribution'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'redistcheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
             projects:
@@ -601,8 +599,6 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
                 - comment-added-contains-event:
                     comment-contains-value: 'revalidate'
             projects:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index e41dc861118377d790abdef69f614569f1f8618f..a29d8df701d2a8b5849df8465602b07ad57fe401 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -160,7 +160,7 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'retox'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
@@ -316,7 +316,7 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'renode'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index acf5a079abf52ba5fc8f5ec9e4aeebf51a0a25d7..8b5b7cc126d514bcab4816d4a86a5c12b0a17b27 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -57,9 +57,9 @@
             server-name: 'OpenDaylight'
             trigger-on:
                 - patchset-created-event:
-                    exclude-drafts: 'false'
+                    exclude-drafts: 'true'
                     exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
+                    exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'