Merge "Add netvirt rtd jobs"

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index fc916af7be2c0d8eddbb0b47d0930215e33a496f..733c4038d4a6890ff1ff8ddccf20d89e5d228ee7 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
 HARDWARE_ID=v2-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index 90d776c258a0d846d3c83dddc445caeb3a3bf1da..0b3d3a9ec0ea09c8bc88d59389dca22ad9e8aed5 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index 54c618849b90f37dad35694c3576738bc0ed5ce8..89387d0308b615c4f6e5eeb3ba2b0939682d5537 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180215-2201
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
 HARDWARE_ID=v2-standard-2

diff --git a/jjb/autorelease/branch-cut.sh b/jjb/autorelease/branch-cut.sh
index 02df34e2214174dad41b8811c561c7a0fed7acfc..3ae2d2a58c90c39639f7d963f2673eca676063de 100644 (file)
--- a/jjb/autorelease/branch-cut.sh
+++ b/jjb/autorelease/branch-cut.sh
@@ -30,7 +30,7 @@ set -eu -o pipefail
 
 # Validate inputs
 if [ -z "$RELEASE" ]; then
-    echo "ERROR: RELEASE variable most be set to a release name. Eg Carbon"
+    echo "ERROR: RELEASE variable must be set to a release name. Eg Carbon"
     exit 1
 fi
 

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 42f7e4a0fd5f0f200aa41fc18b952379b32c9403..77d08b0d780fd61331505cb8d219410daf6242b9 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -26,10 +26,6 @@
       - all:
           scope: 'all'
 
-    verify-stream: 'oxygen'
-    verify-branch: 'stable/oxygen'
-    verify-karaf-version: 'karaf4'
-
     # Mininet configuration
     tools_system_count: 3
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
@@ -48,7 +44,6 @@
       - inttest-csit-verify-1node
       - inttest-csit-verify-3node
 
-
     # The project name
     project: 'genius'
 
@@ -65,6 +60,10 @@
           branch: 'stable/carbon'
           karaf-version: karaf3
 
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
+    verify-karaf-version: 'karaf4'
+
     install:
       - all:
           scope: 'all'

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index b3da33674beb45cbc8bfa469e0394a2fc9162301..cbe81a93bb2186b52cde39fa8bee6cad7fa4c620 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -321,17 +321,37 @@ else
 fi
 
 echo "Starting Robot test suites ${SUITES} ..."
-pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
--v JAVA_HOME:${JAVA_HOME} -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
--v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
--v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
--v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
--v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \
--v TOOLS_SYSTEM_USER:${USER} -v JDKVERSION:${JDKVERSION} -v ODL_STREAM:${DISTROSTREAM} -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
--v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} \
--v MININET3:${TOOLS_SYSTEM_4_IP} -v MININET4:${TOOLS_SYSTEM_5_IP} -v MININET5:${TOOLS_SYSTEM_6_IP} \
--v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
-# FIXME: Sort (at least -v) options alphabetically.
+pybot -N ${TESTPLAN} \
+      --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+      -v BUNDLEFOLDER:${BUNDLEFOLDER} \
+      -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
+      -v CONTROLLER:${ODL_SYSTEM_IP} \
+      -v CONTROLLER_USER:${USER} \
+      -v JAVA_HOME:${JAVA_HOME} \
+      -v JDKVERSION:${JDKVERSION} \
+      -v MININET1:${TOOLS_SYSTEM_2_IP} \
+      -v MININET2:${TOOLS_SYSTEM_3_IP} \
+      -v MININET3:${TOOLS_SYSTEM_4_IP} \
+      -v MININET4:${TOOLS_SYSTEM_5_IP} \
+      -v MININET5:${TOOLS_SYSTEM_6_IP} \
+      -v MININET:${TOOLS_SYSTEM_IP} \
+      -v MININET_USER:${USER} \
+      -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
+      -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \
+      -v ODL_STREAM:${DISTROSTREAM} \
+      -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
+      -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
+      -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \
+      -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
+      -v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} \
+      -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} \
+      -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \
+      -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} \
+      -v TOOLS_SYSTEM_USER:${USER} \
+      -v USER_HOME:${HOME} \
+      -v WORKSPACE:/tmp \
+      ${TESTOPTIONS} ${SUITES} || true
 
 echo "Examining the files in data/log and checking filesize"
 ssh ${ODL_SYSTEM_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index bdc95e07ea58a8ee307617fcd49340e5a076c242..b7f69811678ab0e3d7fa12776477f7419085b5bb 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -12,6 +12,10 @@
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: integration/test
+          rtd-project: odl-integrationtest
       - gerrit-tox-verify:
           branch: master
           stream: master

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 3d38119e4edc01230e8b3df8b1e1c58932efd0d2..6e2100179e6fb8fe7c254bfc6a1c8cd066aa2b85 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -32,6 +32,7 @@
     jdk: 'openjdk8'
 
     branch: master
+    build-timeout: 60
     global-settings-file: global-settings
     settings-file: opflex-settings
     group-id: org.opendaylight.opflex

diff --git a/jjb/packaging/build-deb.sh b/jjb/packaging/build-deb.sh
index 608f3bc79e826e05de3177acbc614165e1779b2f..1e43e5421050dddb3ddabe35a020868d577d5486 100644 (file)
--- a/jjb/packaging/build-deb.sh
+++ b/jjb/packaging/build-deb.sh
@@ -32,7 +32,7 @@ elif  [ "$SILO" == "releng" ]; then
   mkdir -p "$UPLOAD_FILES_PATH"
   # Note: no source packages are available, since the debs are not built
   # from the actual source
-  mv "$WORKSPACE/packaging/packages/deb/opendaylight/"*.deb "$_"
+  ln -s "$WORKSPACE/packaging/packages/deb/opendaylight/"*.deb "$_"
 else
   echo "Unknown Jenkins silo: $SILO"
   exit 1

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 8a7c0b0ee2e37c5a199faae5bf42c63cd33cd749..70ff2f0e99fa4913b6e3bb1bd0c93a0975f37c4d 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -4,6 +4,10 @@
     project-name: packaging
 
     jobs:
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: integration/packaging
+          rtd-project: odl-integrationpackaging
       - 'packaging-build-rpm-{stream}'
       - 'packaging-build-rpm-{distro}-snap-{stream}'
       - 'packaging-build-deb-{stream}'
@@ -494,13 +498,16 @@
     builders:
       - shell: !include-raw: install-deb.sh
       - shell: !include-raw: start-odl.sh
+      - shell: !include-raw-escape: test-ports-nofeature.sh
       - shell: |
           # Install expect to interact with Karaf shell
-          sudo apt-get install -y expect
           # Install nmap to check status of ODL's SSH port
-          sudo apt-get install -y nmap
+          sudo apt-get install -y expect nmap
       - shell: !include-raw: test-karaf-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw-escape: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-deb.sh
 
     publishers:
       - lf-infra-publish

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 5d8a89e41fbb951cdbf1849bd5852043ec4a1d0d..0ec0a7b3812c748990d306ded38cf6ad0da2d566 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -13,6 +13,8 @@
     stream:
       - master:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:

diff --git a/jjb/packaging/test-rpm-docker.sh b/jjb/packaging/test-rpm-docker.sh
index a5c15f471093738c9f2563207354ff24b41b3599..c91acc53a26c223ab4686b39310f78616d8e2e1b 100644 (file)
--- a/jjb/packaging/test-rpm-docker.sh
+++ b/jjb/packaging/test-rpm-docker.sh
@@ -26,7 +26,7 @@ sudo docker exec $docker_id /bin/bash $scripts_path/start-odl.sh
 sudo docker exec $docker_id /bin/bash $scripts_path/test-ports-nofeature.sh
 
 # Don't install test feature and check REST for Oxygen, ODLPARENT-139 breaks it
-if [ "$STREAM" == "oxygen" ]; then
+if [ "$STREAM" == "oxygen" ] || [ "$STREAM" == "fluorine" ]; then
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf-oxygensafe.expect
 else
   sudo docker exec $docker_id /usr/bin/expect $scripts_path/test-karaf.expect

diff --git a/jjb/packaging/uninstall-deb.sh b/jjb/packaging/uninstall-deb.sh
new file mode 100644 (file)
index 0000000..7630144
--- /dev/null
+++ b/jjb/packaging/uninstall-deb.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Uninstall ODL
+sudo dpkg --purge opendaylight
+
+# Verify ODL not installed
+if dpkg -s opendaylight; then
+    # Fail if exit code 0, ie ODL is still installed
+    echo "OpenDaylight unexpectedly still installed"
+    exit 1
+else
+    echo "OpenDaylight not installed, as expected"
+fi