Merge "Install lftools using the global-jjb scripts"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 58beb477bc3152d1d4de9086360337acdb7c4755..75631bed7706ca3ed7e36e2efb06974759f18977 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -40,4 +40,5 @@ Following are the list of published images available to be used with Jenkins job
 * Ubuntu 14.04 LTS Trusty Tahr (cloudimg)
 * Ubuntu 16.04 - gbp - 20170308-0321
 * Ubuntu 16.04 - mininet-ovs-25 - 20170308-0230
+* Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740
 * Ubuntu 16.04 LTS (2016-05-03 cloudimg)

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index cb15c2ec1acbe4a7e832ab0892a3ac754f408362..4c5d3f0b58bd00260a3f58f7c343561e35139f07 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -27,10 +27,16 @@ in the jenkins-master_ silo and this can be achieved by simply creating a
 
 .. code-block:: bash
 
-    git clone https://git.opendaylight.org/gerrit/releng/builder
+    git clone --recursive https://git.opendaylight.org/gerrit/releng/builder
     cd builder
     mkdir jjb/<new-project>
 
+.. note:
+
+    releng/global-jjb is a submodule of releng/builder repository which
+    requires a git submodule update --init or using --recursive with git clone.
+    `releng-global-jjb`_
+
 Where <new-project> should be the same name as your project's git repo in
 Gerrit. So if your project is called "aaa" then create a new jjb/aaa directory.
 
@@ -432,7 +438,7 @@ First, clone the latest version of the `releng-builder-repo`_.
 
 .. code-block:: bash
 
-    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+    $ git clone --recursive https://git.opendaylight.org/gerrit/p/releng/builder.git
 
 Before actually installing JJB and its dependencies, make sure you've `created
 and activated <Virtual Environments_>`_ a virtual environment for JJB.
@@ -802,7 +808,7 @@ example is provided by releng/builder at `example-jenkins.ini`_.
 .. code-block:: bash
 
     # If you don't have RelEng/Builder's repo, clone it
-    $ git clone https://git.opendaylight.org/gerrit/p/releng/builder.git
+    $ git clone --recursive https://git.opendaylight.org/gerrit/p/releng/builder.git
     # Make a copy of the example JJB config file (in the builder/ directory)
     $ cp jenkins.ini.example jenkins.ini
     # Edit jenkins.ini with your username, API token and ODL's sandbox URL
@@ -959,6 +965,7 @@ If `using Docker <JJB Docker image_>`_:
 .. _releng-wiki: https://wiki.opendaylight.org/view/RelEng:Main
 .. _releng-builder-gerrit: https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder
 .. _releng-builder-repo: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=summary
+.. _releng-global-jjb: https://gerrit.linuxfoundation.org/infra/#/q/project:releng/global-jjb
 .. _releng-builder-wiki: https://wiki.opendaylight.org/view/RelEng/Builder
 .. _streams-design-background: https://lists.opendaylight.org/pipermail/release/2015-July/003139.html
 .. _spinup-scripts: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
deleted file mode 100644 (file)
index 9bfd6f8..0000000
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: armoury-csit-basic
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-
-    # The project name
-    project: 'armoury'
-
-    # The functionality under test
-    functionality: 'basic'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-armoury-workloadmanager
-
-    # Robot custom options
-    robot-options: ''

diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml
index 4d63f28c2e0d042065769005e70669a6f5ba88a1..e475941b8294279aba3d5ab57eac48a67917a509 100644 (file)
--- a/jjb/dluxapps/dluxapps-csit-yangman.yaml
+++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml
@@ -23,7 +23,7 @@
 
     # dluxapps started in Carbon project, so current verify with Boron is not working
     verify-stream: 'carbon'
-    verify-branch: 'carbon'
+    verify-branch: 'stable/carbon'
 
     install:
       - only:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index f06c034e9c43d12eba1356e71ef56aa7e66d7219..3fd3f3ce263fb676a2d6860e2476f2f7de4481d1 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -75,6 +75,7 @@
     # FIXME: Describe this job in docs/jenkins.rst
     name: 'docs-verify-rtd-{stream}'
     node: centos7-java-builder-2c-8g
+    concurrent: true
 
     project-type: freestyle
 

diff --git a/jjb/eman/eman-csit-model.yaml b/jjb/eman/eman-csit-model.yaml
deleted file mode 100644 (file)
index 30db058..0000000
--- a/jjb/eman/eman-csit-model.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: eman-csit-model
-    jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
-
-    # The project name
-    project: 'eman'
-
-    # The functionality under test
-    functionality: 'model'
-
-    # Project branches
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-
-    install:
-      - only:
-          scope: 'only'
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-mdsal-apidocs,odl-eman-ui'
-
-    # Robot custom options
-    robot-options: ''

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 53c2d7ab125a6cdb649024653460ba0799abd670..68a31279410b8212b3f7ae38ae789dbbf35f54ee 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -5,12 +5,16 @@
       - '{project}-csit-3node-{functionality}-{install}-{stream}'
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
       - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-verify-3node-{functionality}'
+
 
     # The project name
     project: 'genius'
 
     # The functionality under test
-    functionality: 'genius'
+    functionality:
+      - 'upstream'
+      - 'gate'
 
     # Project branches
     stream:

diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml
index b4167143f0091f29dd1ed474c7aac561ee01fccd..666c4a37d4d6b6868433360b70539f5cbbcf7766 100644 (file)
--- a/jjb/genius/genius-patch-test.yaml
+++ b/jjb/genius/genius-patch-test.yaml
@@ -32,5 +32,5 @@
 
       - genius:
           csit-list: >
-              genius-csit-1node-genius-only-{stream},
-              genius-csit-1node-genius-all-{stream}
+              genius-csit-1node-gate-only-{stream},
+              genius-csit-1node-gate-all-{stream}

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index bee3932227ff6c7b798c6ab6b940a2e8c8aaa430..75719880084a0d32bd329fa40aced5a38287e299 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -196,8 +196,9 @@
       - trigger-builds:
           - project: '{csit-list}'
             block: true
-            predefined-parameters:
+            predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification:

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index 45eaae9f4c5b13ea623af4584aed9b6f568ef597..18766ea46c27ce506db3e83c10af25a7a68356aa 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -78,7 +78,10 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             *)
                 echo "Unexpected status: $OS_STATUS"
-                exit 1
+                # DO NOT exit on unexpected status. Rackspace sometimes returns unexpected status
+                # before returning an expected status. Just print the message and loop until we have
+                # a confirmed state or timeout.
+                # exit 1
             ;;
         esac
     done

diff --git a/jjb/packaging/include-raw-test-puppet.sh b/jjb/packaging/include-raw-test-puppet.sh
index cd063e2e620eded47156d88967b08960dcfee7ee..22b151176cf080fbe0e1c90d5ed2424acdbb12f3 100644 (file)
--- a/jjb/packaging/include-raw-test-puppet.sh
+++ b/jjb/packaging/include-raw-test-puppet.sh
@@ -18,9 +18,12 @@ sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make r
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 curl -L get.rvm.io | bash -s stable
 # Expected by RVM, seems required to make RVM functions (`rvm use`) available
+# Silence absurdly verbose rvm output by temporally not echoing commands
+set +x
 # shellcheck disable=SC1090
 source "$HOME/.rvm/scripts/rvm"
 rvm install 2.4.0
+set -x
 ruby --version
 # This has to be done as a login shell to get rvm fns
 # https://rvm.io/support/faq#what-shell-login-means-bash-l
@@ -31,7 +34,10 @@ ruby --version
 # Install gems dependencies of puppet-opendaylight via Bundler
 gem install bundler
 echo export PATH="\\$PATH:/usr/local/bin" >> "$HOME/.bashrc"
+# RVM's loaded functions print lots of output at this step, silence them
+set +x
 pushd "$WORKSPACE/puppet"
+set -x
 bundle install
 bundle update
 

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index acfc7c345bb957d5fffdcf83b5854b2c15917228..5f5e046bce449286a38958a4974f6db8fd806bf6 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -77,7 +77,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: TEST_SUITE
-          default: 'acceptance6_dock'
+          default: 'acceptance_dock'
           description: 'Set of tests to execute, Rakefile task'
 
     scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index f34fe3cad702af674a09f0ab27e733a774454248..e9c317abee5f9b4d37478fdde3aecd8770e43387 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -205,8 +205,6 @@
         aaa-csit-1node-tls-only-nitrogen,
         alto-csit-1node-setup-all-nitrogen,
         alto-csit-1node-setup-only-nitrogen,
-        armoury-csit-1node-basic-all-nitrogen,
-        armoury-csit-1node-basic-only-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-all-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-nitrogen,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-nitrogen,
@@ -243,12 +241,10 @@
         distribution-csit4-1node-userfeatures-only-nitrogen,
         dluxapps-csit-1node-yangman-all-nitrogen,
         dluxapps-csit-1node-yangman-only-nitrogen,
-        eman-csit-1node-model-all-nitrogen,
-        eman-csit-1node-model-only-nitrogen,
-        genius-csit-1node-genius-all-nitrogen,
-        genius-csit-1node-genius-only-nitrogen,
-        genius-csit-3node-genius-all-nitrogen,
-        genius-csit-3node-genius-only-nitrogen,
+        genius-csit-1node-upstream-all-nitrogen,
+        genius-csit-1node-upstream-only-nitrogen,
+        genius-csit-3node-upstream-all-nitrogen,
+        genius-csit-3node-upstream-only-nitrogen,
         groupbasedpolicy-csit-1node-3-node-all-nitrogen,
         groupbasedpolicy-csit-1node-3-node-only-nitrogen,
         groupbasedpolicy-csit-1node-6node-all-nitrogen,
@@ -410,8 +406,6 @@
         aaa-csit-1node-tls-only-carbon,
         alto-csit-1node-setup-all-carbon,
         alto-csit-1node-setup-only-carbon,
-        armoury-csit-1node-basic-all-carbon,
-        armoury-csit-1node-basic-only-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-all-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-carbon,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-carbon,
@@ -446,12 +440,10 @@
         distribution-csit-1node-userfeatures-only-carbon,
         dluxapps-csit-1node-yangman-all-carbon,
         dluxapps-csit-1node-yangman-only-carbon,
-        eman-csit-1node-model-all-carbon,
-        eman-csit-1node-model-only-carbon,
-        genius-csit-1node-genius-all-carbon,
-        genius-csit-1node-genius-only-carbon,
-        genius-csit-3node-genius-all-carbon,
-        genius-csit-3node-genius-only-carbon,
+        genius-csit-1node-upstream-all-carbon,
+        genius-csit-1node-upstream-only-carbon,
+        genius-csit-3node-upstream-all-carbon,
+        genius-csit-3node-upstream-only-carbon,
         groupbasedpolicy-csit-1node-3-node-all-carbon,
         groupbasedpolicy-csit-1node-3-node-only-carbon,
         groupbasedpolicy-csit-1node-6node-all-carbon,
@@ -610,8 +602,6 @@
         aaa-csit-1node-idmlite-only-boron,
         alto-csit-1node-setup-all-boron,
         alto-csit-1node-setup-only-boron,
-        armoury-csit-1node-basic-all-boron,
-        armoury-csit-1node-basic-only-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-all-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-boron,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-boron,
@@ -641,12 +631,10 @@
         didm-csit-1node-discovery-only-boron,
         distribution-csit-1node-userfeatures-all-boron,
         distribution-csit-1node-userfeatures-only-boron,
-        eman-csit-1node-model-all-boron,
-        eman-csit-1node-model-only-boron,
-        genius-csit-1node-genius-all-boron,
-        genius-csit-1node-genius-only-boron,
-        genius-csit-3node-genius-all-boron,
-        genius-csit-3node-genius-only-boron,
+        genius-csit-1node-upstream-all-boron,
+        genius-csit-1node-upstream-only-boron,
+        genius-csit-3node-upstream-all-boron,
+        genius-csit-3node-upstream-only-boron,
         groupbasedpolicy-csit-1node-3-node-all-boron,
         groupbasedpolicy-csit-1node-3-node-only-boron,
         groupbasedpolicy-csit-1node-6node-all-boron,
@@ -803,8 +791,6 @@
         aaa-csit-1node-idmlite-only-beryllium,
         alto-csit-1node-setup-all-beryllium,
         alto-csit-1node-setup-only-beryllium,
-        armoury-csit-1node-basic-all-beryllium,
-        armoury-csit-1node-basic-only-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-all-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-beryllium,
         bgpcep-csit-1node-periodic-bgp-ingest-mixed-only-beryllium,

diff --git a/tox.ini b/tox.ini
index 3f2334b99a4949974e300e80efda64d0944d2859..65dd26cb68a868952e16f2d530ef83bbdc1e4686 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = true
 [testenv:coala]
 basepython = python3
 deps =
-    coala
+    coala<0.11
     coala-bears
 commands =
     python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger