Merge "Add unique ID to vm hostnames"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 57ad9c6462a221c395350fec129815f1f99ad42c..c2c355b2ed39fe6eed0a88cded7eea7835435cde 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -7,6 +7,7 @@
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
+      - gerrit-tox-verify
 
     # todo: After boron EOL remove next-release-tag and directy pass
     # '{stream}' to autorelease-release-tag parameter
@@ -39,6 +40,7 @@
 
     project: releng/autorelease
     project-name: autorelease
+    build-node: centos7-java-builder-2c-4g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index aa06b28875efa3ff9182682339c89e4e98533cc3..8f93fdbc264093c1e0172df350f9e31fec41da74 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -33,6 +33,7 @@ local_conf_file_name=${WORKSPACE}/local.conf_control_${HOSTIP}
 cat > ${local_conf_file_name} << EOF
 [[local|localrc]]
 LOGFILE=stack.sh.log
+USE_SCREEN=True
 SCREEN_LOGDIR=/opt/stack/data/log
 LOG_COLOR=False
 RECLONE=${RECLONE}
@@ -230,6 +231,7 @@ cat > ${local_conf_file_name} << EOF
 [[local|localrc]]
 LOGFILE=stack.sh.log
 LOG_COLOR=False
+USE_SCREEN=True
 SCREEN_LOGDIR=/opt/stack/data/log
 RECLONE=${RECLONE}
 

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 85a37898fcdb22d255c075f0bc08d677839a4146..dcb3f64c414631dfb2fbe4409408af887e6c8450 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -25,7 +25,7 @@
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           schedule-weekly: 'H 23 * * 6'
-          csit-high-frequency-list: ''
+          csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
           schedule-high-frequency: ''
 
       - nitrogen:
@@ -36,7 +36,7 @@
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           schedule-weekly: 'H 23 * * 6'
-          csit-high-frequency-list: ''
+          csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
           schedule-high-frequency: ''
 
       - carbon:

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 83d25690b6fba07cbeef0e1d5d8eed5a43ffd37f..4517c0affc31ba245fb6197f722838b2ad04bc52 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -59,7 +59,7 @@
 
     tools_system_count: 2
 
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170516-0740'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'
 
     enable-networking-l2gw: 'yes'
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index a2c8c6d345bc9a59b65f0b778be6b4ae905875da..5393f1fa9c59233339dada48585a72b3c1ae0ead 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -45,6 +45,10 @@
       - gate-stateful:
           schedule: ''
           sg-mode: 'stateful'
+      - gate-stateful-snat-conntrack:
+          schedule: ''
+          sg-mode: 'stateful'
+          odl-snat-mode: 'conntrack'
       - gate-minimal-transparent:
           schedule: ''
           sg-mode: 'transparent'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index f2037e97607a100ae9fe33249dc9609a24bb904d..eb21e6fa2f4160bd0005ffcdf931c197c018e14e 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -51,7 +51,7 @@
               netvirt-csit-1node-openstack-ocata-gate-transparent-{stream}
       - snat-conntrack:
           csit-list: >
-              netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-{stream}
+              netvirt-csit-1node-openstack-ocata-gate-stateful-snat-conntrack-{stream}
       - hwvtep:
           csit-list: >
               netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index c47747fbb54bb363186d16b6ddd544831eb18efd..6d2699c8860f1b8a698705ef4c6c5ff49d003631 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -103,7 +103,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          artifacts: ''
 
     scm:
       - gerrit-trigger-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 0f4dad035ad267bb313eccf2e6428407f23c4953..a59f398148389cf3e3f9b74c85158091510cb48a 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -156,6 +156,10 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-high-frequency-list-oxygen: >
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-oxygen
+    csit-high-frequency-list-nitrogen: >
+        netvirt-csit-1node-openstack-ocata-upstream-stateful-nitrogen
     csit-high-frequency-list-carbon: >
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon
     csit-sanity-list-oxygen: >

diff --git a/jjb/stack-delete.sh b/jjb/stack-delete.sh
deleted file mode 100644 (file)
index 99b45df..0000000
--- a/jjb/stack-delete.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-if [ -d "$WORKSPACE/.venv-openstack" ]; then
-    # shellcheck disable=SC1090
-    source "$WORKSPACE/.venv-openstack/bin/activate"
-    OS_STATUS=$(openstack stack show -f json -c stack_status "$STACK_NAME" | jq -r '.stack_status')
-    if [ "$OS_STATUS" == "CREATE_COMPLETE" ] || [ "$OS_STATUS" == "CREATE_FAILED" ]; then
-        echo "Deleting $STACK_NAME"
-        openstack stack delete --yes "$STACK_NAME"
-    fi
-fi

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 5845a22d005b33197b685f28c7eaddd65cde0fa0..d459f652cc16486e38bb9dfee19c3d8437237c68 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -37,7 +37,7 @@
     stream: nitrogen
     project: 'yangtools'
     project-name: 'yangtools'
-    branch: 'stable/nitrogen'
+    branch: 'v1.2.x'
     jdk: openjdk8
     jdks:
       - openjdk8