Merge "To enable odl_l3 and l2gw feature work together"

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index afa92bea6a70575779032d2276c86b1f5c371ea8..8c620cee2a17b6c2bdb2708318876866e3bc4ec0 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -16,6 +16,12 @@
       - carbon:
           branch: 'master'
           jre: 'openjdk8'
+\r
+    # TODO: Delete the following if suites are compatible with Boron again.\r
+    verify-stream: 'carbon'\r
+    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.\r
+    verify-branch: 'master'\r
+    # TODO: Update the line above when stable/carbon is created.
 
     install:
       - only:

diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml
new file mode 100644 (file)
index 0000000..44adcb9
--- /dev/null
+++ b/jjb/controller/controller-csit-drb-partnheal.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: mdsal-csit-dom-rpc-broker-partition-and-heal-longevity
+    jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'controller'
+
+    # The functionality under test
+    functionality: 'drb-partnheal-longevity'
+
+    # Project branches
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
+
+    # Built timeout
+    build-timeout: '1500'

diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml
new file mode 100644 (file)
index 0000000..608a50c
--- /dev/null
+++ b/jjb/controller/controller-csit-drb-precedence.yaml
@@ -0,0 +1,29 @@
+---
+- project:
+    name: mdsal-csit-dom-rpc-broker-precedence-longevity
+    jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'controller'
+
+    # The functionality under test
+    functionality: 'drb-precedence-longevity'
+
+    # Project branches
+    stream:
+      - carbon:
+          branch: 'master'
+          jre: 'openjdk8'
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
+
+    # Built timeout
+    build-timeout: '1500'

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 35e23adbefc08191a3f0d046093565dce0416fe4..fd0d97e80be8f3605e40a30f6cd47c57b097a2f2 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -419,7 +419,8 @@ do
     scp extra_debug.sh ${!OS_CTRL_IP}:/tmp
     ${SSH} ${!OS_CTRL_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
     scp ${!OS_CTRL_IP}:/tmp/extra_debug.log ${OS_CTRL_FOLDER}/extra_debug.log
-    scp ${!OS_CTRL_IP}:/opt/stack/devstack/local.conf ${OS_CTRL_FOLDER}/local.conf
+    scp ${!OS_CTRL_IP}:/tmp/*.xz ${OS_CTRL_FOLDER}/
+    mv local.conf_control_${!OS_CTRL_IP} ${OS_CTRL_FOLDER}/local.conf
     mv ${OS_CTRL_FOLDER} ${WORKSPACE}/archives/
 done
 
@@ -436,6 +437,7 @@ do
     scp extra_debug.sh ${!OSIP}:/tmp
     ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
     scp ${!OSIP}:/tmp/extra_debug.log ${OS_COMPUTE_FOLDER}/extra_debug.log
+    scp ${!OSIP}:/tmp/*.xz ${OS_COMPUTE_FOLDER}/
     mv local.conf_compute_${!OSIP} ${OS_COMPUTE_FOLDER}/local.conf
     mv ${OS_COMPUTE_FOLDER} ${WORKSPACE}/archives/
 done
@@ -719,11 +721,36 @@ do
     fi
 
     # Control Node - PUBLIC_BRIDGE will act as the external router
-    GATEWAY_IP="10.10.10.250" # FIXME this should be a parameter, also shared with integration-test
-    GATEWAY_VLAN_ID=167
-    ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} type vlan id ${GATEWAY_VLAN_ID}"
-    ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up"
-    ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} up ${GATEWAY_IP}/24"
+    # Parameter values below are used in integration/test - changing them requires updates in intergration/test as well
+    EXTNET_GATEWAY_IP="10.10.10.250"
+    EXTNET_VLAN_ID=167
+    EXTNET_INTERNET_IP="10.9.9.9"
+    EXTNET_PNF_IP="10.10.10.253"
+    if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
+        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${EXTNET_GATEWAY_IP}/24"
+    else
+        ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID}"
+        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up"
+        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} up ${EXTNET_GATEWAY_IP}/24"
+
+        # Control Node - external net PNF simulation
+        ${SSH} ${!CONTROLIP} "
+            sudo ip netns add pnf_ns;
+            sudo ip link add pnf_veth0 type veth peer name pnf_veth1;
+            sudo ip link set pnf_veth1 netns pnf_ns;
+            sudo ip link set pnf_veth0 up;
+            sudo ip netns exec pnf_ns ifconfig pnf_veth1 up;
+            sudo ip netns exec pnf_ns ip link add link pnf_veth1 name pnf_veth1.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID};
+            sudo ip netns exec pnf_ns ifconfig pnf_veth1.${EXTNET_VLAN_ID} up ${EXTNET_PNF_IP}/24;
+            sudo ovs-vsctl add-port br-physnet1 pnf_veth0;
+        "
+
+        # Control Node - external net internet address simulation
+        ${SSH} ${!CONTROLIP} "
+            sudo ip tuntap add dev internet_tap mode tap;
+            sudo ifconfig internet_tap up ${EXTNET_INTERNET_IP}/24;
+        "
+    fi
 
     # Computes
     compute_index=1

diff --git a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
index 81fb82606564e83d2654b40bb4011eb62ab547a6..89acb6be8dc09012155b7b26482ae765603de860 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-clustering.yaml
@@ -13,9 +13,6 @@
 
     # Project branches
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index fdfcba380531d780d886ee9ef551881e866ae1d3..55fa716e8c38d1cb12528410934f5597fb925f48 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -29,9 +29,6 @@
           schedule: ''
 
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/netvirt/netvirt-legacy-csit.yaml b/jjb/netvirt/netvirt-legacy-csit.yaml
index 45df5bbfb8521580753f50c2d3ce7c279e93c9a8..3d36c38ef43f301af39b2b5f7680d6e08879ba7e 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit.yaml
@@ -13,9 +13,6 @@
 
     # Project branches
     stream:
-      - carbon:
-          branch: 'master'
-          jre: 'openjdk8'
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'

diff --git a/jjb/packaging/include-raw-build-rpm.sh b/jjb/packaging/include-raw-build-rpm.sh
index ee99286b542e65b7a1e6b4d865b3f8a8aa761968..e8fcab79adfc9b6dc12a9e15ebc793be496a12f6 100644 (file)
--- a/jjb/packaging/include-raw-build-rpm.sh
+++ b/jjb/packaging/include-raw-build-rpm.sh
@@ -19,6 +19,5 @@ download_url="${{DOWNLOAD_URL//zip/tar.gz}}"
 
 # Build release specified by build params
 "$WORKSPACE/packaging/rpm/build.py" --download_url "$download_url" \
-                                  --changelog_date "$CHANGELOG_DATE" \
                                   --changelog_name "$CHANGELOG_NAME" \
                                   --changelog_email "$CHANGELOG_EMAIL"

diff --git a/jjb/packaging/include-raw-test-rpm.sh b/jjb/packaging/include-raw-test-rpm.sh
index 1ebe85531cd2f33a7762b14ffeaa07986101a28e..bb321a8a553c9ee38abc197487c4dd7986d60e71 100644 (file)
--- a/jjb/packaging/include-raw-test-rpm.sh
+++ b/jjb/packaging/include-raw-test-rpm.sh
@@ -18,7 +18,9 @@ then
   sudo yum install -y "$URL"
 elif [[ $URL == *.repo ]]
 then
-  sudo curl --silent -o "$REPO_FILE" "$URL"
+  # shellcheck disable=SC2154
+  repo_file="${{URL##*/}}"
+  sudo curl --silent -o /etc/yum.repos.d/"$repo_file" "$URL"
   sudo yum install -y opendaylight
 else
   echo "URL is not a link to .rpm or .repo"

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 16cfd77beb6ad50bcad9075e9dccc5c4ad333dd9..612c728dba95904fb1be16c9cd6523ef9fa5a4b0 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -76,12 +76,8 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
-      - string:
-          name: CHANGELOG_DATE
-          default: 'Sun Aug 25 1991'
-          description: 'Date this RPM was defined'
       - string:
           name: CHANGELOG_NAME
           default: 'Jenkins'
@@ -177,10 +173,6 @@
           # yamllint disable-line rule:line-length
           default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/rpm/example_repo_configs/opendaylight-52-release.repo'
           description: 'Link to .repo or .rpm file'
-      - string:
-          name: REPO_FILE
-          default: '/etc/yum.repos.d/opendaylight-52-release.repo'
-          description: 'Name of the .repo file'
 
     scm:
       - integration-gerrit-scm:
@@ -300,7 +292,7 @@
           description: 'OpenDaylight major (element) version number to build'
       - string:
           name: VERSION_MINOR
-          default: '2'
+          default: '3'
           description: 'OpenDaylight minor (SR) version number to build'
       - string:
           name: VERSION_PATCH
@@ -316,12 +308,12 @@
           description: 'Version of ODL systemd unitfile to download and package in ODL .deb'
       - string:
           name: CODENAME
-          default: 'Boron-SR2'
+          default: 'Boron-SR3'
           description: 'Elemental codename for the ODL release, including SR if applicable'
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron/distribution-karaf-0.5.2-Boron.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.3-Boron-SR3/distribution-karaf-0.5.3-Boron-SR3.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into .deb'
       - string:
           name: JAVA_VERSION

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index f69f5eac1a08cc44e23910a7cccb1e5fc1e4259a..456f8b959f690a2304b45c4c196502b1c4f913a2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -50,7 +50,7 @@
     docker_system_image: CentOS 7 - docker - 20170120-1434
     odl_system_count: 1
     odl_system_flavor: 4 GB General Purpose v1
-    odl_system_image: CentOS 7 - java-builder - 20170126-0058
+    odl_system_image: CentOS 7 - java-builder - 20170311-0517
     openstack_system_count: 1
     openstack_system_flavor: 8 GB General Purpose v1
     openstack_system_image: CentOS 7 - devstack - 20170221-1719
@@ -139,11 +139,28 @@
     10-inclusion-flag: 'off'
     10-exclude-value: ''
 
+    # Manual CSIT job lists used by sanity
+    # and weekly distribution test jobs
+    csit-sanity-list-carbon: >
+        openflowplugin-csit-1node-sanity-only-carbon
+    csit-sanity-list-boron: >
+        openflowplugin-csit-1node-sanity-only-boron
+    csit-weekly-list-carbon: >
+        controller-csit-1node-notifications-longevity-only-carbon,
+        controller-csit-3node-drb-partnheal-longevity-only-carbon,
+        controller-csit-3node-drb-precedence-longevity-only-carbon,
+        openflowplugin-csit-1node-periodic-longevity-only-carbon
+    csit-weekly-list-boron: >
+        openflowplugin-csit-1node-periodic-longevity-only-boron
+
     # CSIT Test List Variables
-    # Space seperated strings to exclude from CSIT lists
+    # Space seperated strings to exclude from
+    # auto generated CSIT job lists
     csit-list-blacklist: 'longevity gate sanity'
+
     # Auto Generated CSIT job lists used
-    # in integration-distribution-test jobs
+    # in regular distribution test jobs
+    # DO NOT EDIT NEXT LINES MANUALLY
     csit-list-carbon: >
         aaa-csit-1node-authn-all-carbon,
         aaa-csit-1node-authn-only-carbon,
@@ -243,6 +260,10 @@
         netvirt-csit-1node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
@@ -270,15 +291,6 @@
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
-        netvirt-legacy-csit-1node-openstack-basic-all-carbon,
-        netvirt-legacy-csit-1node-openstack-basic-only-carbon,
-        netvirt-legacy-csit-1node-openstack-mitaka-upstream-carbon,
-        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-carbon,
-        netvirt-legacy-csit-1node-openstack-newton-upstream-carbon,
-        netvirt-legacy-csit-3node-clustering-only-carbon,
-        netvirt-legacy-csit-3node-openstack-mitaka-upstream-carbon,
-        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-carbon,
-        netvirt-legacy-csit-3node-openstack-newton-upstream-carbon,
         nic-csit-1node-basic-all-carbon,
         nic-csit-1node-basic-only-carbon,
         nic-csit-1node-vtnrenderer-all-carbon,
@@ -299,7 +311,6 @@
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-carbon,
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-carbon,
         openflowplugin-csit-1node-periodic-sw-scalability-daily-only-carbon,
-        openflowplugin-csit-1node-sanity-only-carbon,
         openflowplugin-csit-1node-scalability-only-carbon,
         openflowplugin-csit-3node-clustering-only-carbon,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
@@ -355,11 +366,6 @@
         vtn-csit-3node-manager-all-carbon,
         vtn-csit-3node-manager-only-carbon,
         yangtools-csit-1node-periodic-system-only-carbon
-    csit-sanity-list-carbon: >
-        openflowplugin-csit-1node-sanity-only-carbon
-    csit-weekly-list-carbon: >
-        controller-csit-1node-notifications-longevity-only-carbon,
-        openflowplugin-csit-1node-periodic-longevity-only-carbon
     csit-list-boron: >
         aaa-csit-1node-authn-all-boron,
         aaa-csit-1node-authn-only-boron,
@@ -450,6 +456,10 @@
         netvirt-csit-1node-openstack-newton-upstream-learn-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron,
+        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
         netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
@@ -506,7 +516,6 @@
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-boron,
         openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-boron,
         openflowplugin-csit-1node-periodic-sw-scalability-daily-only-boron,
-        openflowplugin-csit-1node-sanity-only-boron,
         openflowplugin-csit-1node-scalability-only-boron,
         openflowplugin-csit-3node-clustering-only-boron,
         openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron,
@@ -556,10 +565,6 @@
         vtn-csit-1node-openstack-newton-neutron-boron,
         vtn-csit-3node-manager-all-boron,
         vtn-csit-3node-manager-only-boron
-    csit-sanity-list-boron: >
-        openflowplugin-csit-1node-sanity-only-boron
-    csit-weekly-list-boron: >
-        openflowplugin-csit-1node-periodic-longevity-only-boron
     csit-list-beryllium: >
         aaa-csit-1node-authn-all-beryllium,
         aaa-csit-1node-authn-only-beryllium,

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ee76dcc62573a8f3cb9c8cfdffcd22f6c059e675..f9499477a6770aec34b12b8e0f7117b1402e6d41 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -582,7 +582,7 @@
           jobs-filename: "csit_jobs_beryllium.lst"
       - integration-replace-block-text:
           starting-regex: "'csit-list-carbon: >'"
-          ending-regex: "'csit-weekly-list-carbon: >'"
+          ending-regex: "'csit-list-boron: >'"
           file-with-changes-to-insert: "'csit_jobs_carbon.lst'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index cc23be0219e43d6e2451f63c5aef9bade1e4d71d..c6af80ec2fde9d7385bfcf1002e1a2360ea4a4c2 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -275,7 +275,7 @@
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
       maven-name: 'mvn33'
-      goals: |
+      goals: >
           {mvn-goals}
           -Dmerge
           -Dstream={stream}