Merge "Remove all refs to nitrogen from int/dist"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 4873455ff893e1b228646b2b0b5941a2eec8e765..877dc08d18a0ec59f47f0bdc88dbd6e42aa51755 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -18,15 +18,9 @@
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
-          # Run once a week (Sunday) until Nitrogen-SR3 is out.
-          cron: 'H 12 * * 6'
           branch: 'stable/oxygen'
           integration-test: oxygen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          integration-test: nitrogen
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml
index 65d731b4aadc7709b8ebe2948147d908a6b81e56..5c5df61e99e2de20b08eafde6c6d7eaab4dc36bd 100644 (file)
--- a/jjb/autorelease/autorelease-version-management.yaml
+++ b/jjb/autorelease/autorelease-version-management.yaml
@@ -15,5 +15,3 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'

diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh
index 9458429a760395c70ed05fe6f699ce9017f4f2ae..0984d01f7d5a1ca4e9af9af8e3242d253338a67b 100644 (file)
--- a/jjb/autorelease/compare-autorelease-projects.sh
+++ b/jjb/autorelease/compare-autorelease-projects.sh
@@ -15,12 +15,6 @@ echo "---> compare-autorelease-projects.sh"
 # The purpose of this script is to compare list of projects in autorelease
 # are equal to the list of projects in integration/distribution.
 
-# Note: int/dist pom files uses templates only since Oxygen release.
-# Todo: Remove this check after Nitrogen EOL
-if [[ $STREAM =~ nitrogen ]]; then
-    exit 0
-fi
-
 mapfile -t PROJECTS_INT_DIST < <(xmlstarlet sel\
      -N "x=http://maven.apache.org/POM/4.0.0"\
      -t -m "/x:project/x:profiles/x:profile[x:activation/x:activeByDefault='true']/x:dependencies/x:dependency/x:groupId"\

diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh
index a2b8abc3dc93694b2bb5e36cfd220a2c0acc0ef3..b20b845fefea3cc401e5eca5f911dd26ccc85d99 100644 (file)
--- a/jjb/autorelease/prepare-release.sh
+++ b/jjb/autorelease/prepare-release.sh
@@ -45,12 +45,7 @@ git commit -am "Release $RELEASE_TAG"
 modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml)
 for module in $modules; do
     pushd "$module" || exit
-    # TODO: Remove once stable/nitrogen is no longer supported.
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch"
-    else
-        git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
-    fi
+    git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch"
     git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD"
     popd || exit
 done

diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml
deleted file mode 100644 (file)
index b388684..0000000
--- a/jjb/autorelease/validate-autorelease-nitrogen.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
----
-# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
-- project:
-    name: autorelease-validate-nitrogen
-    jobs:
-      - '{project-name}-validate-autorelease-{stream}'
-    stream: nitrogen
-    branch: stable/nitrogen
-    project-name:
-      - aaa:
-          project: aaa
-      - alto:
-          project: alto
-      - bgpcep:
-          project: bgpcep
-      - bier:
-          project: bier
-      - cardinal:
-          project: cardinal
-      - controller:
-          project: controller
-      - coe:
-          project: coe
-      - daexim:
-          project: daexim
-      - dlux:
-          project: dlux
-      - dluxapps:
-          project: dluxapps
-      - eman:
-          project: eman
-      - faas:
-          project: faas
-      - genius:
-          project: genius
-      - groupbasedpolicy:
-          project: groupbasedpolicy
-      - honeycomb-vbd:
-          project: honeycomb/vbd
-      - infrautils:
-          project: infrautils
-      - integration-distribution:
-          project: integration/distribution
-      - l2switch:
-          project: l2switch
-      - lispflowmapping:
-          project: lispflowmapping
-      - mdsal:
-          project: mdsal
-      - nemo:
-          project: nemo
-      - netconf:
-          project: netconf
-      - netvirt:
-          project: netvirt
-      - neutron:
-          project: neutron
-      - nic:
-          project: nic
-      - ocpplugin:
-          project: ocpplugin
-      - of-config:
-          project: of-config
-      - openflowplugin:
-          project: openflowplugin
-      - ovsdb:
-          project: ovsdb
-      - packetcable:
-          project: packetcable
-      - sfc:
-          project: sfc
-      - snmp:
-          project: snmp
-      - snmp4sdn:
-          project: snmp4sdn
-      - sxp:
-          project: sxp
-      - topoprocessing:
-          project: topoprocessing
-      - ttp:
-          project: ttp
-      - unimgr:
-          project: unimgr
-      - usc:
-          project: usc
-      - yangtools:
-          project: yangtools

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index 54bd1203f62b0bb01728a9d132ae6498980b5ca3..d48b49070ed71a29109f688d0d8818a442577320 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -35,15 +35,10 @@ fi
 if [ "$BRANCH_CUT" = "false" ]; then
     git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
 
-    # TODO: Simplify once stable/nitrogen is no longer supported.
     for module in $(git submodule | awk '{ print $2 }')
     do
         pushd "$module"
-        if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-            git checkout -b "v1.2.x" "origin/v1.2.x"
-        else
-            git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
-        fi
+        git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}"
         popd
     done
 fi
@@ -73,14 +68,8 @@ mkdir -p "$patch_dir"
 for module in $(git submodule | awk '{ print $2 }')
 do
     pushd "$module"
-    # TODO: Remove once stable/nitrogen is no longer supported.
-    if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then
-        git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD"
-    else
-        git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
-        git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
-    fi
+    git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch"
+    git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD"
     popd
 done
 

diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh
index 169f29b99bc9f77ec751200c5221452ee63b2ca2..b79fab7f86208499bf6e4f80c16b22e5cb9fd284 100644 (file)
--- a/jjb/integration/integration-deploy-controller-run-test.sh
+++ b/jjb/integration/integration-deploy-controller-run-test.sh
@@ -335,6 +335,7 @@ pybot -N ${TESTPLAN} \
       -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \
       -v ODL_SYSTEM_USER:${USER} \
+      -v TOOLS_SYSTEM_1_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} \

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index e2130df801e0a5a66ab096f2913636e7aeb848ab..86cf45cc6f52daa7c682883fe56a599e9248139c 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -23,12 +23,12 @@
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
@@ -76,65 +76,12 @@
 
     topology:
       - 1node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system2_count: 1
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - gate-stateful
-
-    openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - 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}'
-
-- project:
-    name: netvirt-csit-hwvtep-openstack-integration-nitrogen
-    jobs:
-      - inttest-csit-hwvtep-openstack
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-    testplan: '{project}-{topology}-l2gw-openstack.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
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
-    topology:
-      - 1node:
-          openstack_system2_count: 1
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system2_count: 1
+          openstack_system2_count: 2
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 89f48409f888fe8816cd5f32178e3620c1a25ac7..136062d5b7d027758c11c91525d61ec3c721cfb9 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -116,60 +116,6 @@
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-- project:
-    name: netvirt-csit-openstack-integration-nitrogen
-    jobs:
-      - inttest-csit-openstack
-
-    project: 'netvirt'
-    stream: 'nitrogen'
-    branch: 'stable/nitrogen'
-    testplan: '{project}-{topology}-openstack.txt'
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,tempest'
-    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'
-      - 3node:
-          openstack_system2_count: 3
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    functionality:
-      - upstream-stateful
-      - upstream-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-stateful
-      - gate-stateful-snat-conntrack:
-          odl-snat-mode: 'conntrack'
-      - gate-minimal-cluster:
-          testplan: '{project}-{topology}-minimal-openstack.txt'
-
-    openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
-          odl-ml2-port-binding: 'pseudo-agentdb-binding'
-          openstack_system_image: '{openstack_system_image_pike}'
-          openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-      - 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}'
-
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
@@ -199,11 +145,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     openstack:
       - queens:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 8cf106f8837c77fc3c00813402df58e71e900594..9b8698c7a3cdcb7701809ca8a798d6542864b37f 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -9,8 +9,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     project: 'netvirt'
     archive-artifacts: '*.log **/target/surefire-reports/*.txt'

diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml
index 194d2d69b6d50fcfbcad0cae4d24bc009f2e8ae1..d9369a1096f1a5b808cb701a5a153e91b72868bb 100644 (file)
--- a/jjb/netvirt/netvirt-patch-test.yaml
+++ b/jjb/netvirt/netvirt-patch-test.yaml
@@ -15,9 +15,6 @@
       - oxygen:
           branch: 'stable/oxygen'
           os-branch: 'queens'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          os-branch: 'pike'
 
     jdk: 'openjdk8'
 

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 6f83a6b8131b20b2739e126bbf05aa222dded35f..4024faed806d113522fdbcea97c20b8b63f81493 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -18,8 +18,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
     project: 'netvirt'
     project-name: 'netvirt'

diff --git a/packer/common-packer b/packer/common-packer
index e3344fc74b1fc3e40cf8f4f7e713047373d9b177..54119a6668c212276639e556ce36ba54c0960f2b 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit e3344fc74b1fc3e40cf8f4f7e713047373d9b177
+Subproject commit 54119a6668c212276639e556ce36ba54c0960f2b