Add integration code for rocky

Change-Id: I4abe948f4334bc97f26bb57d9fd50ef7a233d43c
Signed-off-by: JayaPr <jaya.priyadarshini@ericsson.com>

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 74e484acc0d1c5332dc312226341d078d01cc5d4..dfa2934ff12f0d136bc5f63a0bff8ed71c11f8f7 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -16,7 +16,9 @@ ADMIN_PASSWORD="admin"
 OPENSTACK_MASTER_CLIENTS_VERSION="queens"
 #Size of the partition to /opt/stack in control and compute nodes
 TMPFS_SIZE=2G
-
+if [ "${ODL_ML2_BRANCH}" == "stable/rocky" ]; then
+            TMPFS_SIZE=12G
+fi
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 printf "\nshowing recent changes that made it into the distribution used by this job:\n"
 $PYTHON -m pip install --upgrade urllib3
@@ -92,6 +94,8 @@ function install_openstack_clients_in_robot_vm() {
     for package in ${packages[*]}; do
        echo "Get the current support version of the package ${package}"
        wget https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt -O /tmp/constraints.txt 2>/dev/null
+       #python openstackclient version in rocky contradicts with version in global-jjb and stops openstackclient installation in rocky. Will be removed based on version change in global-jjb.
+       sed -i s/python-openstackclient===3.16.2/python-openstackclient===3.14.0/ /tmp/constraints.txt
        echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt"
        $PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt
        echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt"
@@ -110,12 +114,16 @@ function install_openstack_clients_in_robot_vm() {
 function install_rdo_release() {
     local ip=$1
     case ${OPENSTACK_BRANCH} in
+       *rocky*)
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky-1.noarch.rpm"
+          ;;
+
        *queens*)
           ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
           ;;
 
        master)
-          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm"
+          ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-rocky/rdo-release-rocky-1.noarch.rpm"
           ;;
     esac
 }
@@ -142,16 +150,13 @@ EOF
 #from pypi.org (latest version as of 06-Dec-2018)
 function fix_libvirt_python_build() {
     local ip=$1
-
-    if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
-        ${SSH} ${ip} "
-            cd /opt/stack;
-            git clone https://git.openstack.org/openstack/requirements;
-            cd requirements;
-            git checkout stable/queens;
-            sed -i s/libvirt-python===3.10.0/libvirt-python===4.10.0/ upper-constraints.txt
+    ${SSH} ${ip} "
+        cd /opt/stack;
+        git clone https://git.openstack.org/openstack/requirements;
+        cd requirements;
+        git checkout ${ODL_ML2_BRANCH};
+        sed -i s/libvirt-python===3.10.0/libvirt-python===4.10.0/ upper-constraints.txt
         "
-   fi
 }
 
 # Involves mounting the share and configuring the libvirtd
@@ -825,16 +830,14 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     # Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS could be used for the flat_networks
     # and Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS could be used for the ml2_type_vlan
     ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
-    if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
-       ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
-       ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
-       #Workaround for networking-sfc to configure the paramaters in neutron.conf if the
-       # services used are neutron-api, neutron-dhcp etc instead of q-agt.
-       # Can be removed if the patch https://review.openstack.org/#/c/596287/ gets merged
-       if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
-           scp ${WORKSPACE}/workaround_networking_sfc.sh ${!CONTROLIP}:/tmp/
-           ssh ${!CONTROLIP} "bash -x /tmp/workaround_networking_sfc.sh"
-       fi
+    ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron"
+    ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron"
+    #Workaround for networking-sfc to configure the paramaters in neutron.conf if the
+    # services used are neutron-api, neutron-dhcp etc instead of q-agt.
+    # Can be removed if the patch https://review.openstack.org/#/c/596287/ gets merged
+    if [[ "${ENABLE_OS_PLUGINS}" =~ networking-sfc ]]; then
+       scp ${WORKSPACE}/workaround_networking_sfc.sh ${!CONTROLIP}:/tmp/
+       ssh ${!CONTROLIP} "bash -x /tmp/workaround_networking_sfc.sh"
     fi
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP} "${ODL_OVS_MGRS}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf