Merge "Check for stacks delete in progress"

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 d22ccf13064d67f9c96b3564ce16d4f636f79150..a3a38778e844138469ffce1eb164b7aa7282c312 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -486,6 +486,13 @@ cd devstack
 git checkout $OPENSTACK_BRANCH
 EOF
 
+cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
+sudo nova-manage cell_v2 map_cell0
+sudo nova-manage cell_v2 simple_cell_setup
+sudo nova-manage db sync
+sudo nova-manage cell_v2 discover_hosts
+EOF
+
 [ "$NUM_OPENSTACK_SITES" ] || NUM_OPENSTACK_SITES=1
 compute_index=1
 odl_index=1
@@ -639,6 +646,14 @@ do
         exit 1
     fi
 
+    # For Ocata, if we do not enable the n-cpu in control node
+    # We need to discover hosts manually and ensure that they are mapped to cells.
+    # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/
+    if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then
+        scp ${WORKSPACE}/setup_host_cell_mapping.sh  ${!CONTROLIP}:/tmp
+        ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh"
+    fi
+
     # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node
     # this needs to happen after devstack runs because it seems devstack is pulling in specific versions
     # of these libs that are not working for tempest.

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 23c4a80fb0e8bfc509022e95bddffed5b2bd0513..4e1ba2f688a4f4ae2ff9a96e30e6b2aadc1dd82d 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -75,6 +75,11 @@
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     security-group-mode: '{sg-mode}'
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
index aa91baf8cd64e027111e874e766c9524fb091201..e72b2ade41ca51ca913d5315588327b25e5961f9 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-multi-openstack.yaml
@@ -48,5 +48,10 @@
           odl-ml2-branch: 'stable/newton'
           odl-ml2-driver-version: 'v2'
           openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-newton - 20170314-2256'
 
     public-bridge: 'br-ex'

diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh
index a7bd4afdfd039bebfc343ae7d7f28e40eb4df2c8..9e0266ea96977eb38d1dee1d2fef3c9ad1dac91c 100644 (file)
--- a/jjb/opendaylight-infra-push-gerrit-patch.sh
+++ b/jjb/opendaylight-infra-push-gerrit-patch.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# upgrade git-review to a version that will have the --reviewers option. existing minion
+# image has a version that does not have it.
+sudo pip install git-review --upgrade
+
 # shellcheck disable=SC1083
 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \
                limit:1 owner:self is:open project:{project} \

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 1fd19e887fd4ff46c17de24bc463ffe1b49eb6cf..5057903097085ab3a862823774ec0d9a0fc654c4 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -239,12 +239,16 @@
         didm-csit-1node-discovery-only-nitrogen,
         distribution-csit-1node-userfeatures-all-nitrogen,
         distribution-csit-1node-userfeatures-only-nitrogen,
+        distribution-csit4-1node-userfeatures-all-nitrogen,
+        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,
         groupbasedpolicy-csit-1node-3-node-all-nitrogen,
         groupbasedpolicy-csit-1node-3-node-only-nitrogen,
         groupbasedpolicy-csit-1node-6node-all-nitrogen,
@@ -294,6 +298,10 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-1node-openstack-newton-upstream-transparent-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
@@ -302,6 +310,10 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-transparent-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-nitrogen,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
@@ -432,14 +444,14 @@
         didm-csit-1node-discovery-only-carbon,
         distribution-csit-1node-userfeatures-all-carbon,
         distribution-csit-1node-userfeatures-only-carbon,
-        distribution-csit4-1node-userfeatures-all-carbon,
-        distribution-csit4-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,
         groupbasedpolicy-csit-1node-3-node-all-carbon,
         groupbasedpolicy-csit-1node-3-node-only-carbon,
         groupbasedpolicy-csit-1node-6node-all-carbon,
@@ -489,6 +501,10 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
@@ -497,6 +513,10 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
@@ -625,6 +645,8 @@
         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,
         groupbasedpolicy-csit-1node-3-node-all-boron,
         groupbasedpolicy-csit-1node-3-node-only-boron,
         groupbasedpolicy-csit-1node-6node-all-boron,
@@ -669,6 +691,10 @@
         netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-learn-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
+        netvirt-csit-1node-openstack-ocata-upstream-transparent-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
@@ -677,6 +703,10 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-learn-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-boron,
+        netvirt-csit-3node-openstack-ocata-upstream-transparent-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
@@ -693,9 +723,11 @@
         netvirt-legacy-csit-1node-openstack-basic-only-boron,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-1node-openstack-newton-upstream-boron,
+        netvirt-legacy-csit-1node-openstack-ocata-upstream-boron,
         netvirt-legacy-csit-3node-clustering-only-boron,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-upstream-boron,
+        netvirt-legacy-csit-3node-openstack-ocata-upstream-boron,
         nic-csit-1node-basic-all-boron,
         nic-csit-1node-basic-only-boron,
         nic-csit-1node-vtnrenderer-all-boron,
@@ -839,9 +871,11 @@
         netvirt-legacy-csit-1node-openstack-basic-only-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-upstream-beryllium,
+        netvirt-legacy-csit-1node-openstack-ocata-upstream-beryllium,
         netvirt-legacy-csit-3node-clustering-only-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-upstream-beryllium,
+        netvirt-legacy-csit-3node-openstack-ocata-upstream-beryllium,
         nic-csit-1node-basic-all-beryllium,
         nic-csit-1node-basic-only-beryllium,
         nic-csit-1node-vtnrenderer-all-beryllium,