Merge "Use local-*.yaml style Common Packer CFG"

diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh
index e79228f336442c5164aded132bf7455a0bf7e21b..3309b00ab11322912a3e9d0c924f74ef84091f44 100755 (executable)
--- a/jenkins-scripts/jenkins-init-script.sh
+++ b/jenkins-scripts/jenkins-init-script.sh
@@ -24,3 +24,9 @@ source /tmp/system_type.sh
 
 ## add local environment changes post scripts
 ./jenkins-init-script-local-env.sh
+
+# Create a swap file
+dd if=/dev/zero of=/swap count=1024 bs=1MiB
+chmod 600 /swap
+mkswap /swap
+swapon /swap

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
index db986df65b6d598bd92f5272432237d3a71675ef..87628338e25c98bf459b8f30bf0724cb3d703495 100644 (file)
--- a/jjb/autorelease/validate-autorelease-oxygen.yaml
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -77,3 +77,5 @@
           project: unimgr
       - usc:
           project: usc
+      - vtn:
+          project: vtn

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index fea7ca0358dc170ed3f8c880b8b274343d3a105f..1d64f2e5d8273dc22ed285fec147bcc1a0c348b0 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,12 +1,9 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
 
     # The project name
     project: 'genius'
@@ -23,6 +20,39 @@
     stream:
       - oxygen:
           branch: 'master'
+    install:
+      - all:
+          scope: 'all'
+
+    # Mininet configuration
+    tools_system_count: 3
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
+
+    # Features to install
+    install-features: 'odl-genius-rest'
+
+    # Robot custom options
+    robot-options: ' '
+
+- project:
+    name: genius-csit-genius-{stream}
+    jobs:
+      - inttest-csit-1node
+      - inttest-csit-3node
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
+
+
+    # The project name
+    project: 'genius'
+
+    # The functionality under test
+    functionality:
+      - 'upstream'
+      - 'gate'
+
+    # Project branches
+    stream:
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 1e33309a143108eb31fcc4271eea776becad34e4..e8dc87b6b938605306fbca842b47fc7b687dde42 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -165,6 +165,16 @@ function fix_libvirt_version_n_cpu_ocata() {
    "
 }
 
+function fix_tinyrpc_version() {
+    local ip=$1
+    ${SSH} ${ip} "
+        cd /opt/stack;
+        git clone https://git.openstack.org/openstack/requirements;
+        cd requirements;
+        sed -i s/tinyrpc===0.7/tinyrpc===0.6/ upper-constraints.txt
+   "
+}
+
 # Add enable_services and disable_services to the local.conf
 function add_os_services() {
     local core_services=$1
@@ -951,6 +961,8 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     if [ "${ODL_ML2_BRANCH}" == "master" ]; 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"
+       echo "Modify uppper-constraints to use tinyrpc 0.6"
+       fix_tinyrpc_version ${!CONTROLIP}
     fi
     if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then
         echo "Updating requirements for ${ODL_ML2_BRANCH}"
@@ -1011,6 +1023,10 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
         echo "Modify upper-constraints to use libvirt-python 3.2.0"
         fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP}
     fi
+    if [ "${ODL_ML2_BRANCH}" == "master" ]; then
+       echo "Modify uppper-constraints to use tinyrpc 0.6"
+       fix_tinyrpc_version ${!CONTROLIP}
+    fi
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
@@ -1188,10 +1204,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
         sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
     "
-    # Control Node - set VXLAN TEP IP for Genius Auto TZ
-    ${SSH} ${!CONTROLIP} "
-        sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
-    "
 
     # Control Node - external net internet address simulation
     ${SSH} ${!CONTROLIP} "

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 2537b1b1da0051d3a6131141f87d10e71afaaa31..88d6a4a42c16308ab5470d94b29a77319d9122b0 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -11,10 +11,10 @@
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -23,23 +23,19 @@
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
@@ -74,10 +70,10 @@
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -86,24 +82,19 @@
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
@@ -132,7 +123,6 @@
       - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
@@ -140,10 +130,10 @@
     odl-ml2-driver-version: 'v2'
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    security-group-mode: 'stateful'
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -152,24 +142,19 @@
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:

diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
index 345cfa721b319f9f81da6dff0dceccc5ee83bbc5..ea8df73b66d082084200f72ac4a52ba686777fbe 100644 (file)
--- a/jjb/packaging/packaging-macros.yaml
+++ b/jjb/packaging/packaging-macros.yaml
@@ -15,7 +15,8 @@
       - shell: !include-raw: start-odl.sh
       - shell: !include-raw: test-ports-nofeature.sh
       - shell: !include-raw: test-karaf.expect
-      - shell: !include-raw: test-rest-ok.sh
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-rpm.sh
       - shell: |

diff --git a/jjb/packaging/test-karaf.expect b/jjb/packaging/test-karaf.expect
index 5368e208ba57916312e1457b357b91a742185b68..8b5fbcd67e1651992b74c6aa27f6e9c39e2caebe 100644 (file)
--- a/jjb/packaging/test-karaf.expect
+++ b/jjb/packaging/test-karaf.expect
@@ -42,26 +42,27 @@ expect {{
   }}
 }}
 
+# Disable this test until ODLPARENT-139 is fixed
 # Install feature
-expect "$prompt"
-send "feature:install odl-netvirt-openstack\r"
-expect {{
-  "Error executing command: Can't install feature" {{
-    send_user "\nFailed to install test feature\n"
-    exit 1
-  }}
-}}
+# expect "$prompt"
+# send "feature:install odl-netvirt-openstack\r"
+# expect {{
+#   "Error executing command: Can't install feature" {{
+#     send_user "\nFailed to install test feature\n"
+#     exit 1
+#   }}
+# }}
 
 # Verify installed feature is actually installed
-expect "$prompt"
+# expect "$prompt"
 # The -i flag will only show installed features
-send "feature:list -i | grep odl-netvirt-openstack\r"
-expect {{
-  timeout {{
-    send_user "\nTest feature not installed\n"
-    exit 1
-  }}
-  "OpenDaylight :: NetVirt :: OpenStack" {{
-    send_user "\nTest feature installed successfully\n"
-  }}
-}}
+# send "feature:list -i | grep odl-netvirt-openstack\r"
+# expect {{
+#   timeout {{
+#     send_user "\nTest feature not installed\n"
+#     exit 1
+#   }}
+#   "OpenDaylight :: NetVirt :: OpenStack" {{
+#     send_user "\nTest feature installed successfully\n"
+#   }}
+# }}