Merge "Enable dhcp service flag set for ODL Dhcp"

diff --git a/jenkins.ini.example b/jenkins.ini.example
index 6c2308bfee017943fb5c6e0d26c5ceee8d4295b5..15c6909280ae23d3f0812fe00a653c200f0fcfae 100644 (file)
--- a/jenkins.ini.example
+++ b/jenkins.ini.example
@@ -3,6 +3,7 @@ ignore_cache=True
 keep_descriptions=False
 include_path=.
 recursive=True
+retain_anchors=True
 
 [jenkins]
 user=#odl_username#

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index d9966511b5d8ff7d13b86d0e00bf8008ff65cdff..8194f2a2ebd191cde37cf57c1a4f48211ca618c2 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -16,11 +16,13 @@
       - fluorine:
           branch: 'master'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g -Dskip.karaf.featureTest=true
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
       - oxygen:
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g -Dskip.karaf.featureTest=true
+          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
+              -Dskip.karaf.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 549cb0ccbad478da383ed9400d257db7fa839b77..1200269dad8ec12bf95d4275571154f9d4161442 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -26,7 +26,7 @@
     devstack-networking-sfc-plugin-repo: 'https://github.com/openstack/networking-sfc'
 
     # lf-infra defaults
-    jenkins-ssh-credential: opendaylight-jenkins-ssh
+    jenkins-ssh-credential: jenkins-ssh
     gerrit-server-name: OpenDaylight
     mvn-site-id: opendaylight-site
     mvn-snapshot-id: opendaylight-snapshot
@@ -58,6 +58,7 @@
     tenant-network-type: 'vxlan'
     odl-sfc-driver: 'odl'
     odl-snat-mode: 'controller'
+    enable-itm-direct-tunnels: 'false'
     openstack_legacy_default_network_services: 'q-dhcp,q-meta,q-svc'
 
     # openstack-infra-parameters defaults

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 2b4fca8ba1a2f7862ebd771d0111c7cbd4e442bf..d0dddc7e5ea93df8e47b90bdf6afd2edfd966cb5 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 2b4fca8ba1a2f7862ebd771d0111c7cbd4e442bf
+Subproject commit d0dddc7e5ea93df8e47b90bdf6afd2edfd966cb5

diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
index a59e511c311621e311c266754a561a9d6b475e6e..766f3897773fe1a9155668fcd9c2de64072bc1f3 100644 (file)
--- a/jjb/integration/csit-jobs-fluorine.lst
+++ b/jjb/integration/csit-jobs-fluorine.lst
@@ -30,13 +30,19 @@ netconf-csit-3node-cluster-stress-all-fluorine,
 netconf-csit-3node-clustering-all-fluorine,
 netconf-csit-3node-clustering-scale-all-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-1node-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-1node-openstack-queens-sfc-fluorine,
+netvirt-csit-1node-openstack-queens-upgrade-fluorine,
+netvirt-csit-1node-openstack-queens-upgrade-snat-conntrack-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine,
+netvirt-csit-1node-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-3node-openstack-pike-upstream-stateful-fluorine,
+netvirt-csit-3node-openstack-pike-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-3node-openstack-queens-upstream-stateful-fluorine,
+netvirt-csit-3node-openstack-queens-upstream-stateful-itm-direct-tunnels-fluorine,
 netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-fluorine,

diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst
index 8d5eb2be1c74f36950e721f9690c9ee686e4a596..532b3dc9660c942b510fc8e7bb4f6aea6b9d3d92 100644 (file)
--- a/jjb/integration/csit-jobs-oxygen.lst
+++ b/jjb/integration/csit-jobs-oxygen.lst
@@ -41,13 +41,17 @@ netconf-csit-1node-userfeatures-all-oxygen,
 netconf-csit-3node-cluster-stress-all-oxygen,
 netconf-csit-3node-clustering-all-oxygen,
 netconf-csit-3node-clustering-scale-all-oxygen,
+netvirt-csit-1node-openstack-pike-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-1node-openstack-queens-sfc-oxygen,
+netvirt-csit-1node-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
+netvirt-csit-3node-openstack-pike-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
+netvirt-csit-3node-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-oxygen,
 netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-oxygen,
 netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-oxygen,

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 685b25d7e8d0b11c334e717830fb93036327e123..d155edb2ea54ee7f3fb480775310aead7fc5a3e8 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -77,6 +77,7 @@ ENABLE_OS_PLUGINS: ${ENABLE_OS_PLUGINS}
 DISABLE_OS_SERVICES: ${DISABLE_OS_SERVICES}
 TENANT_NETWORK_TYPE: ${TENANT_NETWORK_TYPE}
 SECURITY_GROUP_MODE: ${SECURITY_GROUP_MODE}
+ENABLE_ITM_DIRECT_TUNNELS: ${ENABLE_ITM_DIRECT_TUNNELS}
 PUBLIC_PHYSICAL_NETWORK: ${PUBLIC_PHYSICAL_NETWORK}
 ENABLE_NETWORKING_L2GW: ${ENABLE_NETWORKING_L2GW}
 CREATE_INITIAL_NETWORKS: ${CREATE_INITIAL_NETWORKS}
@@ -185,6 +186,44 @@ function install_rdo_release() {
     esac
 }
 
+# Involves just setting up the shared directory
+function setup_live_migration_control() {
+    local control_ip=$1
+    printf "${control_ip}:Setup directory Share with NFS"
+    cat > ${WORKSPACE}/setup_live_migration_control.sh << EOF
+sudo mkdir --mode=777 /vm_instances
+sudo chown -R jenkins:jenkins /vm_instances
+sudo yum install -y nfs-utils
+printf "/vm_instances *(rw,no_root_squash)" | sudo tee -a /etc/exports
+sudo systemctl start rpcbind nfs-server
+sudo exportfs
+EOF
+    scp ${WORKSPACE}/setup_live_migration_control.sh ${control_ip}:/tmp/setup_live_migration_control.sh
+    ssh ${control_ip} "bash /tmp/setup_live_migration_control.sh"
+}
+
+# Involves mounting the share and configuring the libvirtd
+function setup_live_migration_compute() {
+    local compute_ip=$1
+    local control_ip=$2
+    printf "${compute_ip}:Mount Shared directory from ${control_ip}"
+    printf "${compute_ip}:Configure libvirt in listen mode"
+    cat >  ${WORKSPACE}/setup_live_migration_compute.sh << EOF
+sudo yum install -y libvirt libvirt-devel nfs-utils
+sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' listen_tls 0
+sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' listen_tcp 1
+sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' auth_tcp '"none"'
+sudo crudini --verbose  --set --inplace /etc/sysconfig/libvirtd '' LIBVIRTD_ARGS '"--listen"'
+sudo mkdir --mode=777 -p /var/instances
+sudo chown -R jenkins:jenkins /var/instances
+sudo chmod o+x /var/instances
+sudo systemctl start rpcbind
+sudo mount -t nfs ${control_ip}:/vm_instances /var/instances
+sudo mount
+EOF
+    scp ${WORKSPACE}/setup_live_migration_compute.sh ${compute_ip}:/tmp/setup_live_migration_compute.sh
+    ssh ${compute_ip} "bash /tmp/setup_live_migration_compute.sh"
+}
 
 # Add enable_services and disable_services to the local.conf
 function add_os_services() {
@@ -223,9 +262,8 @@ function create_control_node_local_conf() {
     cat > ${local_conf_file_name} << EOF
 [[local|localrc]]
 LOGFILE=stack.sh.log
-USE_SCREEN=True
-SCREEN_LOGDIR=/opt/stack/data/log
 LOG_COLOR=False
+USE_SYSTEMD=True
 RECLONE=${RECLONE}
 # Increase the wait used by stack to poll for services
 SERVICE_TIMEOUT=120
@@ -335,6 +373,7 @@ EOF
 [[post-config|\$NEUTRON_CONF]]
 [DEFAULT]
 service_plugins = ${SERVICE_PLUGINS}
+log_dir = /opt/stack/logs
 
 [[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
 [agent]
@@ -357,15 +396,21 @@ EOF
 
     cat >> ${local_conf_file_name} << EOF
 
+[ml2_odl]
+# Trigger n-odl full sync every 30 secs.
+maintenance_interval = 30
+
 [[post-config|/etc/neutron/dhcp_agent.ini]]
 [DEFAULT]
 force_metadata = True
 enable_isolated_metadata = True
+log_dir = /opt/stack/logs
 
 [[post-config|/etc/nova/nova.conf]]
 [DEFAULT]
 force_config_drive = False
 force_raw_images = False
+log_dir = /opt/stack/logs
 
 [scheduler]
 discover_hosts_in_cells_interval = 30
@@ -386,8 +431,7 @@ function create_compute_node_local_conf() {
 [[local|localrc]]
 LOGFILE=stack.sh.log
 LOG_COLOR=False
-USE_SCREEN=True
-SCREEN_LOGDIR=/opt/stack/data/log
+USE_SYSTEMD=True
 RECLONE=${RECLONE}
 # Increase the wait used by stack to poll for the nova service on the control node
 NOVA_READY_TIMEOUT=1800
@@ -448,6 +492,10 @@ auth_strategy = keystone
 [DEFAULT]
 use_neutron = True
 force_raw_images = False
+log_dir = /opt/stack/logs
+[libvirt]
+live_migration_uri = qemu+tcp://%s/system
+virt_type = qemu
 EOF
 
     echo "Compute local.conf created:"
@@ -786,6 +834,7 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
     install_rdo_release ${!CONTROLIP}
+    setup_live_migration_control ${!CONTROLIP}
     echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}"
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
@@ -842,6 +891,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
     echo "Install rdo release to avoid incompatible Package versions"
     install_rdo_release ${!COMPUTEIP}
+    setup_live_migration_compute ${!COMPUTEIP} ${!CONTROLIP}
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
@@ -1118,6 +1168,7 @@ for suite in ${SUITES}; do
     -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
     -v CONTROLLER_USER:${USER} \
     -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
+    -v ENABLE_ITM_DIRECT_TUNNELS:${ENABLE_ITM_DIRECT_TUNNELS} \
     -v HA_PROXY_IP:${HA_PROXY_IP} \
     -v HA_PROXY_1_IP:${HA_PROXY_1_IP} \
     -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \
@@ -1153,6 +1204,7 @@ for suite in ${SUITES}; do
     -v OS_COMPUTE_4_IP:${OPENSTACK_COMPUTE_NODE_4_IP} \
     -v OS_COMPUTE_5_IP:${OPENSTACK_COMPUTE_NODE_5_IP} \
     -v OS_COMPUTE_6_IP:${OPENSTACK_COMPUTE_NODE_6_IP} \
+    -v CMP_INSTANCES_SHARED_PATH:/var/instances \
     -v OS_USER:${USER} \
     -v PUBLIC_PHYSICAL_NETWORK:${PUBLIC_PHYSICAL_NETWORK} \
     -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \

diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh
index 48d5f84f317847e950771dd7de1e9838ad75cf24..b825b1533ff9df7d8108ab2d6bcf2f85e1bf9e56 100644 (file)
--- a/jjb/integration/integration-install-robotframework.sh
+++ b/jjb/integration/integration-install-robotframework.sh
@@ -23,6 +23,7 @@ set -exu
 
 # Make sure pip itself us up-to-date.
 pip install --upgrade pip
+pip3 install --upgrade pip
 
 pip install --upgrade docker-py importlib requests scapy netifaces netaddr ipaddr pyhocon
 pip install --upgrade robotframework-httplibrary \
@@ -55,6 +56,13 @@ pip install --upgrade jmespath
 # Module for backup-restore support library
 pip install --upgrade jsonpatch
 
+#Module for elasticsearch python client
+#Module for elasticsearch python client
+pip3 install --user https://files.pythonhosted.org/packages/63/cb/6965947c13a94236f6d4b8223e21beb4d576dc72e8130bd7880f600839b8/urllib3-1.22-py2.py3-none-any.whl
+pip3 install --user https://files.pythonhosted.org/packages/b8/f7/3bb4d18c234a8ce7044d5ee2e1082b7d72bf6c550afb8d51ae266dea56f1/requests-2.9.1-py2.py3-none-any.whl
+pip3 install --user https://files.pythonhosted.org/packages/c3/e3/146b675e6d0138a49c4b817b4e68170eb9b75cee7e71fa3ec69624c4f467/elasticsearch-6.2.0-py2.py3-none-any.whl
+pip3 install --user https://files.pythonhosted.org/packages/75/5e/b84feba55e20f8da46ead76f14a3943c8cb722d40360702b2365b91dec00/PyYAML-3.11.tar.gz
+
 # Print installed versions.
 pip install --upgrade pipdeptree
 pipdeptree

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 633782d2784784d6d477b02b82069fa07379b3c7..c7634c551af5b3387f3bc04f5021be784a4f0d68 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -934,6 +934,10 @@
           name: SECURITY_GROUP_MODE
           default: '{security-group-mode}'
           description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
       - string:
           name: PUBLIC_PHYSICAL_NETWORK
           default: '{public-physical-network}'
@@ -1143,6 +1147,10 @@
           name: SECURITY_GROUP_MODE
           default: '{security-group-mode}'
           description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
       - string:
           name: PUBLIC_PHYSICAL_NETWORK
           default: '{public-physical-network}'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 2f9a39a92e283e9fe73a6aedba1ec320d243bd61..ac1afdd5fd142013b1527222dbb94b6f980283d2 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -4,7 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
       - odl-maven-jobs
 
     stream: fluorine
@@ -27,7 +28,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}':
           mvn-version: 'mvn35'
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          mvn-version: 'mvn33'
       - odl-maven-jobs
 
     stream: oxygen

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
new file mode 100644 (file)
index 0000000..565bd6f
--- /dev/null
+++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
@@ -0,0 +1,37 @@
+---
+- project:
+    name: netvirt-csit-upgrade-openstack-integration-oxygen
+    jobs:
+      - inttest-csit-openstack
+
+    project: 'netvirt'
+    stream: 'fluorine'
+    branch: 'master'
+    testplan: '{project}-{topology}-openstack-upgrade.txt'
+    odl-ml2-driver-version: 'v2'
+    enable-openstack-services: 'placement-api,l2gw-plugin'
+    enable-openstack-compute-services: 'placement-client'
+    security-group-mode: 'stateful'
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
+
+    topology:
+      - 1node:
+          openstack_system2_count: 2
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+
+    functionality:
+      - upgrade
+      - upgrade-snat-conntrack:
+          odl-snat-mode: 'conntrack'
+
+    openstack:
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
+          odl-ml2-port-binding: 'pseudo-agentdb-binding'
+          openstack_system_image: '{openstack_system_image_pike}'
+          openstack_system2_image: '{openstack_system_image_pike}'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index b88655e37be0fae96531584d07699d25a930fe5d..c17dee868ab736cc2186fac4250e93ee1c4fa262 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -31,6 +31,8 @@
 
     functionality:
       - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful
@@ -90,6 +92,8 @@
 
     functionality:
       - upstream-stateful
+      - upstream-stateful-itm-direct-tunnels:
+          enable-itm-direct-tunnels: 'true'
       - upstream-stateful-snat-conntrack:
           odl-snat-mode: 'conntrack'
       - gate-stateful

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index d8fec09d3c1bcb2f1064f307baeafdddef1a543e..4504640e80fe656a2465782269fa5e5782a353c0 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -41,3 +41,9 @@
       - coe:
           csit-list: >
               coe-csit-1node-container-networking-all-{stream}
+      - itm-direct-tunnels:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-upstream-stateful-itm-direct-tunnels-{stream}
+      - upgrade:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-upgrade-{stream}

diff --git a/jjb/odltools/odltools.yaml b/jjb/odltools/odltools.yaml
new file mode 100644 (file)
index 0000000..58b3797
--- /dev/null
+++ b/jjb/odltools/odltools.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: odltools
+    jobs:
+      - gerrit-tox-verify
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odltools
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odltools/40832/
+          rtd-token: 225d4ef64e1efce4fe3ba4c9c4fe772355d3c8b2
+
+    stream:
+      - fluorine:
+          branch: 'master'
+
+    project: odltools
+    project-name: odltools
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 5c862b2abba569958b9e67cada8eb7038fe5f59b..aa2b85a0912436a278d70f07b2ef8b42eb6d97e4 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -67,7 +67,7 @@
       - string:
           name: DOWNLOAD_URL
           # yamllint disable-line rule:line-length
-          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
           description: 'URL to ODL tarball artifact to repackage into RPM'
       - string:
           name: CHANGELOG_NAME
@@ -199,10 +199,10 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Oxygen SR1 release tarball
+      # Test Oxygen SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -216,7 +216,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2209/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -224,7 +224,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -280,10 +280,10 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Oxygen SR1 release tarball
+      # Test Oxygen SR2 release tarball
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -291,7 +291,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2192/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2210/org/opendaylight/integration/karaf/0.8.3/karaf-0.8.3.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -299,7 +299,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.2-SNAPSHOT/karaf-0.8.2-20180524.145206-1.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.3-SNAPSHOT/karaf-0.8.3-20180620.173319-5.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -313,7 +313,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2209/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
@@ -321,7 +321,7 @@
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 

diff --git a/jjb/packaging/test-puppet.sh b/jjb/packaging/test-puppet.sh
index 492e7d93410e37965a75fa9fa10b4334c4c3c6fb..f346aa3788e02bd4c7d673afdb01e3da50a0f04a 100644 (file)
--- a/jjb/packaging/test-puppet.sh
+++ b/jjb/packaging/test-puppet.sh
@@ -15,7 +15,7 @@ sudo yum install -y ruby-devel gcc-c++ zlib-devel patch redhat-rpm-config make r
 
 # Install RVM to help build recent version of Ruby
 # The ruby_dep gem requires >=2.2.5, 2.0.0 is the latest pre-packaged for CentOS
-gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 curl -L get.rvm.io | bash -s stable
 # Expected by RVM, seems required to make RVM functions (`rvm use`) available
 # Silence absurdly verbose rvm output by temporally not echoing commands

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 36b4dbebd25ed382df8a449e21d2853b79f94bdc..b76c175959e335bbfe1350a1708f4efe70686e39 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: serviceutils-fluorine
+    name: serviceutils
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -11,10 +11,14 @@
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
       - odl-maven-jobs
 
-    stream: fluorine
+    stream:
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+
     project: 'serviceutils'
     project-name: 'serviceutils'
-    branch: 'master'
     build-node: centos7-builder-2c-2g
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'