Remove all refs to nitrogen in packaging

Ref:
https://meetings.opendaylight.org/opendaylight-meeting/2018/tsc/opendaylight-meeting-tsc.2018-04-26-16.59.html

Change-Id: I806b10e5fe861d125c1425468e767817bd10829f
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh
index 20f632e71618c02e6da44196c18478497d5d1725..cffc29bdbbb79b39716f2ada594d6d5fd570cc09 100644 (file)
--- a/jjb/packaging/build-rpm-snap.sh
+++ b/jjb/packaging/build-rpm-snap.sh
@@ -15,9 +15,7 @@ $PYTHON -m pip install --upgrade pip
 $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt"
 
 # Convert stream to numeric ODL major version
-if [ "$STREAM" == "nitrogen" ]; then
-  VERSION_MAJOR=7
-elif [ "$STREAM" == "oxygen" ]; then
+if [ "$STREAM" == "oxygen" ]; then
   VERSION_MAJOR=8
 elif [ "$STREAM" == "fluorine" ]; then
   VERSION_MAJOR=9

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 0465cf603f5c4afc1f24f5a535d79cff2db022ab..c7b761b4686a44fd06edb872dc589529f936c58e 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -26,7 +26,6 @@
 
     stream:
       - fluorine
-      - nitrogen
       - oxygen
     distro:
       - opensuse-42
@@ -200,13 +199,6 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Nitrogen 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.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
       # Test Oxygen pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
@@ -275,34 +267,6 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      # Test Nitrogen 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.7.0/karaf-0.7.0.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test Nitrogen SR1 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.7.1/karaf-0.7.1.tar.gz'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test Nitrogen multipatch zip (no parallel tarball available)
-      # 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.7.3-SNAPSHOT/karaf-0.7.3-20180408.214158-1.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
-
-      # Test latest Nitrogen snapshot
-      - inject:
-          properties-content: 'STREAM=nitrogen'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
-
       # Test Oxygen pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
@@ -464,7 +428,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: PACKAGE
-          default: 'ppa:odl-team/nitrogen'
+          default: 'ppa:odl-team/oxygen'
           description: 'Link to .deb package or name of PPA repo'
 
     scm:

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 5ef7d58efb1af09a798d0768477f4319a98e8e05..0fd69b51c6ae0c04102384507a0fbe391e5bcf35 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -15,8 +15,6 @@
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'

diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh
index a6cc205e184b80e8a12430d6bcf6731582b32c9e..84f4a6968d0110cbe2502b3b3b987fe00ee41868 100644 (file)
--- a/jjb/packaging/test-ports-nofeature.sh
+++ b/jjb/packaging/test-ports-nofeature.sh
@@ -13,8 +13,7 @@ set -ex -o pipefail
 declare -a expected_ports=("1099" "8101" "44444")
 
 # Ports that should only be open after odl-nevirt-openstack is installed
-# 8080 is Nitrogen and Carbon only, not Oxygen
-declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8181" "8185")
 
 # Make sure expected ports open
 COUNT="0"